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 21:27:24 +0000 (21:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 21:27:24 +0000 (21:27 +0000)
am: 36f3126596

Change-Id: I4692e709879129aa80766ce093b18f6b6f71c1ec


Trivial merge