OSDN Git Service

(root) / android-x86 / system-media.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11296a6 6c26438)
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
authorEino-Ville Talvala <etalvala@google.com>
Thu, 18 Aug 2016 00:52:09 +0000 (00:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Aug 2016 00:52:09 +0000 (00:52 +0000)
am: 6c26438b34

Change-Id: If0237b95606d01f108a70eee7a59d9ac87eb17d9


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