OSDN Git Service

Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1...
authorRay Essick <essick@google.com>
Mon, 14 Nov 2016 22:10:59 +0000 (22:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 22:10:59 +0000 (22:10 +0000)
commit5c9ef550d51e916d2a92a907a1cd900da4413e40
tree817075963bfd2003190d642dc3e46377deb85c8e
parent166e6f50cdeaca090105eaea9edc07db920c1ec2
parent54c7cd959ffaf5fabfc184c7b1bb1ddaf16c7684
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566 am: 929cb0f1b4  -s ours am: 36f3126596 am: d4f39a0a85 am: f06b06a624 am: 8a8dc5464e  -s ours am: 5eaa9d22bc am: 6e7c0efb9e
am: 54c7cd959f

Change-Id: I77e686a08d1a0d0ca883853e34984bfc52b437d4