OSDN Git Service

am 80c17e0d: am 450e1015: Fix Ogg album art
authorMarco Nelissen <marcone@google.com>
Sat, 8 Aug 2015 02:52:55 +0000 (02:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Aug 2015 02:52:55 +0000 (02:52 +0000)
* commit '80c17e0d42248053edf7243e026995fefcf6aabd':
  Fix Ogg album art

1  2 
media/libstagefright/OggExtractor.cpp

Simple merge