tree 8869bc0500707c2b68944000f0f5826a3558874b
parent d16204aad92d804f42b374dba572f6d97c9b8f5b
parent 50c3f9756f970caf53eb9582c9aa879c5a6e7660
author Ray Essick <essick@google.com> 1478720510 +0000
committer android-build-merger <android-build-merger@google.com> 1478720510 +0000

DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538b7 am: c3819cfda9 am: c696d76d98  -s ours am: 1e036d883e  -s ours am: 8326a5bd4f am: c7bbcd1bb8  -s ours am: 4978d974e2 am: 3075424b2c am: 1e9da27e4f am: 5ccc36c8d3  -s ours am: a34b0f7e5c am: 6f2bd89626 am: d5bc59b38f am: c18deb4339
am: 50c3f9756f

Change-Id: Ia479a606e9f6041993f2ecc42bdd47f9f9971817