OSDN Git Service

(root) / android-x86 / system-media.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0efacfe ac2655b)
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
authorEino-Ville Talvala <etalvala@google.com>
Wed, 17 Aug 2016 23:28:47 +0000 (23:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:28:47 +0000 (23:28 +0000)
am: ac2655b5cb

Change-Id: I51396e87a67e735379249335e0c229f892db6412


Trivial merge
system/media
About OSDN
Find Software
Develop Software
Help