| commit | 8692685a54f6bf87dadc82fbd5576cdb81ba662b | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Sat Apr 13 00:04:16 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Apr 13 00:04:17 2013 +0000 |
| tree | c1a970fe42d9ee1d77e07e6a10cc1584b5995eba | |
| parent | 15fed390c44972932f6dd7ce3bef1004e8b98b61 [diff] | |
| parent | 2eeda7286f3c7cb79f7eb71ae6464cad213d12a3 [diff] |
Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev * changes: AndroidKeyStore: Add encrypted flag keystore: Add flag for blobs to be unencrypted