OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f420816 3dd656c)
resolve merge conflicts of ffe502b to cw-f-dev
authorAndy Hung <hunga@google.com>
Tue, 18 Oct 2016 20:11:21 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Oct 2016 20:11:21 +0000 (20:11 +0000)
am: 3dd656c624

Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2


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