OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28c51ba 0bd10c2)
am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKey...
authorAlex Klyubin <klyubin@google.com>
Tue, 31 Mar 2015 21:20:51 +0000 (21:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Mar 2015 21:20:51 +0000 (21:20 +0000)
* commit '0bd10c21ff1bb00f178738301ad4663c7cebd28f':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.


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