OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1ab2d3 5dafb34)
am 5dafb34b: resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev
authorQuddus Chong <quddusc@google.com>
Thu, 23 Apr 2015 22:02:12 +0000 (22:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Apr 2015 22:02:12 +0000 (22:02 +0000)
* commit '5dafb34bca889abb8776a320b1ed9544cff9f9b3':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.


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