OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b36f8c 553191d)
Resolve merge conflicts of ffb4eb1 to nyc-dev am: a5abfee3a5
authorKevin Hufnagle <khufnagle@google.com>
Tue, 2 Aug 2016 21:47:26 +0000 (21:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 21:47:26 +0000 (21:47 +0000)
am: 553191dd26

Change-Id: I9f192bef0ad0ca69a991b90e966c362c6cb76d9e


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