tree c37c6dcb1f603f73ec536b55270835abf9bc2d66
parent f7e6f6965fe0d8c943f38069d0dee165c2aa612a
parent c20fe545fc5261070416448044f26b04fa490aa5
author Ray Essick <essick@google.com> 1478717084 +0000
committer android-build-merger <android-build-merger@google.com> 1478717084 +0000

DO NOT MERGE: defensive parsing of mp3 album art information am: 52d02b97a4  -s ours am: d4bce2cc70 am: 64e37f54f5  -s ours am: 5aa1034968
am: c20fe545fc

Change-Id: I102da4bbcb3ed4e1363121b4ef8e732aab2c8e78