OSDN Git Service

am b69a01a5: am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a1...
authorWei Jia <wjia@google.com>
Fri, 21 Aug 2015 20:30:35 +0000 (20:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 20:30:35 +0000 (20:30 +0000)
commit47b90fe20d6ea9409c7009926c60fa33985f4211
treecd2a2983b84ae7384b2fb9192428a78bc9f69188
parentce61bb6abd09be5b49a8e95905243d75a1e9abcf
parentb69a01a576b613fb1e6a2a58c189c8623c5adbac
am b69a01a5: am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

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