OSDN Git Service

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

Change-Id: Iacfc275c1b1a8262289413a53bee77e5782a2df4


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