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:55:58 +0000 (21:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 21:55:58 +0000 (21:55 +0000)
commit6e7c0efb9e152448021e5a66687f49e9ec4b1cc7
tree21f953b00adb2ae3584b06893c0bbdbe9e492819
parent5ef3403fdc1e87d1ccdabe6278a603ba5d3890ac
parent5eaa9d22bc3c95b901dd40874683d738650af6e8
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

Change-Id: I82fb1e189b1e4ce50a2cf21dcc6a016a9aead7c6