tree 6150e887aa6cf610c6dce378775191443267fa26
parent 3453aa5e565c22cdc131f30b1f248ae89127bb21
parent 64e37f54f58ed2c82222a24a57d75527551775b9
author Ray Essick <essick@google.com> 1478716392 +0000
committer android-build-merger <android-build-merger@google.com> 1478716392 +0000

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

Change-Id: I601737a43f54be37d5e8395cfa738fe35692cbe7