OSDN Git Service

am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix...
authorWei Jia <wjia@google.com>
Fri, 21 Aug 2015 20:11:02 +0000 (20:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 20:11:02 +0000 (20:11 +0000)
commit323d22e76e2d96306c5f67edb07bb4c2eef14188
treeeacc4c3d81ae6bb7b7e6c5c483a6f170a0dbdd30
parent21b14554c2c74ff81a381de3ddf893d8ea411161
parent8319fadb99f5d862ed68d44a587b6f1fac2e0d2d
am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

* commit '8319fadb99f5d862ed68d44a587b6f1fac2e0d2d':
  DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage