tree 88e3af45cc4678da270a2043578ca134423d14cc
parent c12fc2ae106d021d23a6e5258dccc22ad84b80f0
parent a65101cd49247f792ae05bc31458c73bbcacf6c0
author Alex Klyubin <klyubin@google.com> 1430274354 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430274354 +0000

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.