tree 04b4793c3da2ce6a21d99a001f15a067052d4ff6
parent 52d02b97a4dc54cff9c4f058eeeab6753c2230a0
parent c696d76d984448723768ce80e461a7e0f09069f8
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: 2ff80538b7 am: c3819cfda9
am: c696d76d98  -s ours

Change-Id: I80f50a474af40a2ea3c732604e77caef6afadf46