OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b569c54
c63bbf9
)
DO NOT MERGE: defensive parsing of mp3 album art information am: 21f2814260 am: b820f...
author
Ray Essick
<essick@google.com>
Wed, 9 Nov 2016 18:38:42 +0000
(18:38 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 9 Nov 2016 18:38:42 +0000
(18:38 +0000)
am:
c63bbf90f9
-s ours
Change-Id: Ia6bd31e33a59ae83b44e124349eb18531f495d10
Trivial merge