tree 8869bc0500707c2b68944000f0f5826a3558874b
parent 876512e43c4b958cdd49d3c2383f692b1489fd36
parent c078d8d15e7266d2756747d46658f111b2a2d733
author Ray Essick <essick@google.com> 1478719517 +0000
committer android-build-merger <android-build-merger@google.com> 1478719517 +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 am: ae44650731 am: 572c3ddcc9  -s ours am: 955d03d798 am: 0806da1ab5 am: 9735865224 am: 2fdea08e32
am: c078d8d15e

Change-Id: I42ea3fc5c0c1cf94b9e125c961ced05eb64478b3