diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-29 02:25:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 02:25:54 +0000 |
| commit | ceb190edbc5feb9ac43801807ce471e7450cdaaa (patch) | |
| tree | 88e3af45cc4678da270a2043578ca134423d14cc /media | |
| parent | c12fc2ae106d021d23a6e5258dccc22ad84b80f0 (diff) | |
| parent | a65101cd49247f792ae05bc31458c73bbcacf6c0 (diff) | |
| download | frameworks_base-ceb190edbc5feb9ac43801807ce471e7450cdaaa.zip frameworks_base-ceb190edbc5feb9ac43801807ce471e7450cdaaa.tar.gz frameworks_base-ceb190edbc5feb9ac43801807ce471e7450cdaaa.tar.bz2 | |
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.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions