OSDN Git Service

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

Change-Id: I25bd8261bb5962ce12e5321156837e9ef8be06b2


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