OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48e1ac3 2a899c1)
am 2a899c1c: am aa0d9387: (-s ours) am 5507bb41: Merge "Fix issue #22653116: Google...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 18:15:36 +0000 (18:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:15:36 +0000 (18:15 +0000)
* commit '2a899c1c5bba1edd717957860abf5ee3c17f0856':


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