OSDN Git Service

am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT...
authorWei Jia <wjia@google.com>
Fri, 21 Aug 2015 20:24:57 +0000 (20:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 20:24:57 +0000 (20:24 +0000)
commitb69a01a576b613fb1e6a2a58c189c8623c5adbac
tree78aea84412b7abd2190379a762a486d7f9bbf5b4
parent52a9a61bd0a213c250bf2e61b66353259d729cfc
parent07a2e912a89d0dc83a8e83b33a066ef3ae1a2333
am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

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