OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b64717 c6d39d4)
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357...
authorTony Mak <tonymak@google.com>
Mon, 11 Sep 2017 15:13:14 +0000 (15:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 15:13:14 +0000 (15:13 +0000)
am: c6d39d47c5  -s ours

Change-Id: I6c10c4d27c64cfbafc45b0535663591f8a320362


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