OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e26de2d 11d8a4c)
resolve merge conflicts of b29a938c to nyc-dev am: 473738d6d3
authorKevin Hufnagle <khufnagle@google.com>
Thu, 4 Aug 2016 01:03:27 +0000 (01:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 01:03:27 +0000 (01:03 +0000)
am: 11d8a4c49e

Change-Id: I904b0fb058a873289f8ca5d712bd8e2ac7d46cb8


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