commit | ceb190edbc5feb9ac43801807ce471e7450cdaaa | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Wed Apr 29 02:25:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 02:25:54 2015 +0000 |
tree | 88e3af45cc4678da270a2043578ca134423d14cc | |
parent | c12fc2ae106d021d23a6e5258dccc22ad84b80f0 [diff] | |
parent | a65101cd49247f792ae05bc31458c73bbcacf6c0 [diff] |
am a65101cd: am ecde0330: am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev * commit 'a65101cd49247f792ae05bc31458c73bbcacf6c0': Align AndroidKeyStore API with user auth API.