OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5584ee2 1d61b01)
DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours...
authorHugo Benichi <hugobenichi@google.com>
Mon, 14 Nov 2016 13:19:50 +0000 (13:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 13:19:50 +0000 (13:19 +0000)
am: 1d61b01a5d

Change-Id: Ie4a49408157b5de6dc0003b148e0d1042c87d515


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