tree b46559134550f3139a56c70d55abfdfd3440aef0
parent 4c1d94395a64f4c3acd8f9e0d378a778e438221d
parent 49ef7dfe2f29cd30c25a5d86a6bf9010afffc903
author Ray Essick <essick@google.com> 1479162792 +0000
committer android-build-merger <android-build-merger@google.com> 1479162792 +0000

DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1 am: 340f678953 am: 32c32abaf2 am: 28e793c11b  -s ours am: 43151ef3a7 am: 5ef3403fdc am: ee465dd72e am: 166e6f50cd am: 15ef7f184f
am: 49ef7dfe2f  -s ours

Change-Id: I748264f543a3f030ad377fc191a367c9d97d2d41