OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f9fae7 da5f10f)
am da5f10f4: (-s ours) am 7026df3b: am 5f8d3728: am b8987585: Merge "docs: studio...
authorRich Sloager <rslogar@google.com>
Thu, 27 Aug 2015 10:31:54 +0000 (10:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:31:54 +0000 (10:31 +0000)
* commit 'da5f10f41fa3d2c5dc01c165946c27df986f2178':


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