tree e23d1014d45c56c570c0cf35d1f738273c6762f6
parent aa8c778d64e5cdbdd8617baa0cc1a022667eb040
parent 5759c46d849fc5ed7faa138637401ee10103a489
author Ray Essick <essick@google.com> 1479158016 +0000
committer android-build-merger <android-build-merger@google.com> 1479158016 +0000

DO NOT MERGE: defensive parsing of mp3 album art information
am: 5759c46d84

Change-Id: Ic50efe3ee2fc52ae3cf227d893723f1d9095dac5