OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3664081 f2685d6)
am f2685d69: (-s ours) am ff7526c1: am 71178f02: am 29dfe902: Merge "docs: studio...
authorRich Sloager <rslogar@google.com>
Thu, 27 Aug 2015 10:31:19 +0000 (10:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:31:19 +0000 (10:31 +0000)
* commit 'f2685d69bb9844b80f7964de2d1c582ce7e46f80':


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