| commit | 47b90fe20d6ea9409c7009926c60fa33985f4211 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Aug 21 20:30:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 20:30:35 2015 +0000 |
| tree | cd2a2983b84ae7384b2fb9192428a78bc9f69188 | |
| parent | ce61bb6abd09be5b49a8e95905243d75a1e9abcf [diff] | |
| parent | b69a01a576b613fb1e6a2a58c189c8623c5adbac [diff] |
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