OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f2142f 628c6de)
am 628c6de7: am 24244c44: am a8232452: Merge "Fix Android Keystore key gen for keys...
authorAlex Klyubin <klyubin@google.com>
Mon, 15 Jun 2015 23:10:53 +0000 (23:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Jun 2015 23:10:53 +0000 (23:10 +0000)
* commit '628c6de7e0560ecb081743a36612ff529d84a26b':
  Fix Android Keystore key gen for keys requiring user auth.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help