| commit | 07a2e912a89d0dc83a8e83b33a066ef3ae1a2333 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Aug 21 20:17:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 20:17:09 2015 +0000 |
| tree | 78aea84412b7abd2190379a762a486d7f9bbf5b4 | |
| parent | bb64d2fb9e458c9bde66dbc79d88462b7db2b652 [diff] | |
| parent | 323d22e76e2d96306c5f67edb07bb4c2eef14188 [diff] |
am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage * commit '323d22e76e2d96306c5f67edb07bb4c2eef14188': DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage