OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86176af a4d7259)
am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build...
authorLeon Scroggins III <scroggo@google.com>
Thu, 6 Mar 2014 22:45:26 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Mar 2014 22:45:26 +0000 (22:45 +0000)
* commit 'a4d7259c8246a07666f732b5e9fd12280b611d2e':
  DO NOT MERGE - Fix Javadoc build break.


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