OSDN Git Service

DO NOT MERGE: defensive parsing of mp3 album art information am: 52d02b97a4 -s ours...
authorRay Essick <essick@google.com>
Wed, 9 Nov 2016 18:33:12 +0000 (18:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 18:33:12 +0000 (18:33 +0000)
am: 64e37f54f5  -s ours

Change-Id: I601737a43f54be37d5e8395cfa738fe35692cbe7


Trivial merge