| commit | 79be3e3d4040ace3643bdda4b6e5d05588f52621 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 15 12:28:56 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 15 12:28:56 2013 -0700 |
| tree | ca864bd83df94149457b19959beb70b9b964e269 | |
| parent | 912abd41b7cb1569d25e888a9b5fa8d50a2786c5 [diff] | |
| parent | 1223495e44acbc2b94809de2455006ec24897734 [diff] |
am 1223495e: Merge "keystore: Add flag for blobs to be unencrypted" * commit '1223495e44acbc2b94809de2455006ec24897734': keystore: Add flag for blobs to be unencrypted