OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cef154 75bcb01)
Merge "resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp" into nyc...
authorAndreas Gampe <agampe@google.com>
Tue, 10 Jan 2017 23:51:35 +0000 (23:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 23:51:35 +0000 (23:51 +0000)
am: 75bcb01466

Change-Id: I62a5c933c49bc7d3c1ee996b09b0255b1fc25d19


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