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:34:25 +0000 (21:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 21:34:25 +0000 (21:34 +0000)
commitf06b06a6242f12e8c038fdd854ceff4ee80bcdcf
tree314e1e611954e0bc86442b2b1f6e1c5749f71d14
parent32c32abaf2b6af4c7f79937b5b7fa01462916e2d
parentd4f39a0a85de0ee9846b070c2acf5db7a9d682f0
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

Change-Id: I5bc5911572683600fdf8265db14f9677f3519e73