OSDN Git Service

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

Change-Id: I85f10646a50af78fdeb8f80411350ecaec06ac40


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