OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a47c38 9adb76b)
am 9adb76b9: (-s ours) am 50a16111: am 285c9cb7: am 4f66c1da: Merge "docs: studio...
authorRich Sloager <rslogar@google.com>
Thu, 27 Aug 2015 10:34:40 +0000 (10:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:34:40 +0000 (10:34 +0000)
* commit '9adb76b961b99462a643529338fc4084b06907ba':


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