OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c239511 4f45842)
resolve merge conflicts of 1723bc14ebfd to stage-aosp-master
authorJason Monk <jmonk@google.com>
Fri, 24 Feb 2017 15:22:39 +0000 (15:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Feb 2017 15:22:39 +0000 (15:22 +0000)
am: 4f458421b1

Change-Id: I5c2b3fb86d1b6629f407df8fb607de639d972260


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