OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef57a0d b3d46b4)
resolve merge conflicts of 17bd236 to stage-aosp-master
authorChih-Hung Hsieh <chh@google.com>
Fri, 12 Aug 2016 19:30:02 +0000 (19:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 19:30:02 +0000 (19:30 +0000)
am: b3d46b44a3

Change-Id: I5123493e165c4d2ab74cf045e5fb8181886dce62


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