OSDN Git Service

am 47b90fe2: (-s ours) am b69a01a5: am 07a2e912: am 323d22e7: am 8319fadb: am f814f84...
authorWei Jia <wjia@google.com>
Fri, 21 Aug 2015 20:39:11 +0000 (20:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 20:39:11 +0000 (20:39 +0000)
* commit '47b90fe20d6ea9409c7009926c60fa33985f4211':
  DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage


Trivial merge