| commit | 520c1036cbf344ec85b9d6bb5b9fdb5d3de44802 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Apr 12 17:13:39 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 12 17:13:39 2013 -0700 |
| tree | 259550e7981e52e351a3cdb96a0a26f38abadc8e | |
| parent | 11dc37686fa284f3c6c63b911febd4547d5bb92b [diff] | |
| parent | 019895e2e4744f9ddd76f5df6d59a74dbc5bcd42 [diff] |
am 019895e2: am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev * commit '019895e2e4744f9ddd76f5df6d59a74dbc5bcd42': AndroidKeyStore: Add encrypted flag keystore: Add flag for blobs to be unencrypted