OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 402ad70 f2d7042)
am f2d70428: am b5501efc: am d25093d2: Merge "Reject AlgorithmParameters of wrong...
authorAlex Klyubin <klyubin@google.com>
Wed, 8 Jul 2015 20:09:12 +0000 (20:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 20:09:12 +0000 (20:09 +0000)
* commit 'f2d70428543727e0c6031e33ce4445ad9589ef6f':
  Reject AlgorithmParameters of wrong type.


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