OSDN Git Service

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

Change-Id: I284ec7a216a987b04562afec5ed811b61d22085f


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