OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81d7a2d 6210e33)
am 6210e332: am 87ec5091: am 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParame...
authorKenny Root <kroot@google.com>
Fri, 13 Dec 2013 01:26:14 +0000 (17:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Dec 2013 01:26:14 +0000 (17:26 -0800)
* commit '6210e332f124c346396b82554e42ae4805bd4282':
  Add GCMParameterSpec to preloaded-classes


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