OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f315a5 e01a7ad)
resolve merge conflicts of 55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp...
authorNeil Fuller <nfuller@google.com>
Tue, 26 Jun 2018 11:05:36 +0000 (04:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Jun 2018 11:05:36 +0000 (04:05 -0700)
am: e01a7adf5a

Change-Id: I993dc856b8fe0f42d7ad5f766727be32d3d611fe

1  2 
Android.bp patch | diff1 | diff2 | blob | history

diff --cc Android.bp
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help