Skip to content
Commit 8692685a authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 

* changes:
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
parents 15fed390 2eeda728
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment