OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ab83ef 83c7d16)
am 83c7d168: (-s ours) am b4e5608d: am 57cdc011: am 054711b6: Merge "docs: studio...
authorRich Sloager <rslogar@google.com>
Thu, 27 Aug 2015 10:31:01 +0000 (10:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:31:01 +0000 (10:31 +0000)
* commit '83c7d1689b6bcddd857770e7b4809c843b09ad76':


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