Alex Klyubin 0219269280 am c89e1a96: am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev ...

* commit 'c89e1a96c5e4cc16928341f30a45e315d1a4abb6':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.

2015-05-01 01:32:53 +00:00

..

java

am c89e1a96: am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev

2015-05-01 01:32:53 +00:00

jni

Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev

2015-04-30 21:00:08 +00:00

res

resolved conflicts for merge of 04f2fe39 to master

2015-04-30 16:17:16 -07:00

tests

am a4edc82e: am 4547dac0: Fix one-off error in reporting.

2015-04-28 21:09:13 +00:00