OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e3f444 c8f7311)
am c8f7311a: (-s ours) am 5fea0488: (-s ours) am 457b283e: (-s ours) am aedc09fb...
authorGeorge Mount <mount@google.com>
Mon, 27 Jul 2015 15:54:19 +0000 (15:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jul 2015 15:54:19 +0000 (15:54 +0000)
* commit 'c8f7311abcc08d4517e56d5031a061f33ed7c318':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.


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