OSDN Git Service

DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e461...
authorRay Essick <essick@google.com>
Mon, 14 Nov 2016 21:48:39 +0000 (21:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 21:48:39 +0000 (21:48 +0000)
am: 28e793c11b  -s ours

Change-Id: Id2544b96d8a262edcded291a0c6d37a510c6b0fc


Trivial merge