| commit | cdff9ddfccdc84b8e19b684f3e437aca37c090f1 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 15 12:34:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 15 12:34:00 2013 -0700 |
| tree | 419c6339264309ab091b8423dcd100a94f499fec | |
| parent | ebbfda9180138a0c050152b79ccefcb8f1f92eac [diff] | |
| parent | 541e0d6d1ca26bb51c87b33921a2baf73c8d7f33 [diff] |
am 541e0d6d: resolved conflicts for merge of 6fb172b1 to jb-mr2-dev-plus-aosp * commit '541e0d6d1ca26bb51c87b33921a2baf73c8d7f33': keystore: Add flag for blobs to be unencrypted