OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 098e781 c99ff3a)
resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master am: dbc7279e85
authorErik Kline <ek@google.com>
Wed, 5 Jul 2017 09:24:43 +0000 (09:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 09:24:43 +0000 (09:24 +0000)
am: c99ff3a1e7  -s ours

Change-Id: Ie3059eb96824e8c826be2e4a2412dab0dca79cb9


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