OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e3c587 ac85959)
am ac859598: am ba43413d: (-s ours) am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152...
authorAdrian Roos <roosa@google.com>
Thu, 27 Aug 2015 18:30:02 +0000 (18:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:30:02 +0000 (18:30 +0000)
* commit 'ac859598cc4fe3284ca093b7eb8d255afd8307a6':


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