OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45effa2 5347490)
resolve merge conflicts of 48bc4c1f420d to stage-aosp-master am: ca0c91b9f1 am: a1110...
authorHugo Benichi <hugobenichi@google.com>
Tue, 20 Jun 2017 09:05:25 +0000 (09:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 09:05:25 +0000 (09:05 +0000)
am: 5347490663

Change-Id: Ibd6c9ef859dcc8b48b632206c59d419ccfed1933


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