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:27:11 +0000 (18:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 18:27:11 +0000 (18:27 +0000)
am: d4bce2cc70

Change-Id: I4bbe609b4fd188182305136c7005fc5aebf33827


Trivial merge