| commit | 8319fadb99f5d862ed68d44a587b6f1fac2e0d2d | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Aug 21 20:03:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 20:03:06 2015 +0000 |
| tree | 849d18a0d5ad54470904bfbfe7e24004ede61cb3 | |
| parent | e4a9d859e10930f187fc037e0a1cc8d1eb5c21c5 [diff] | |
| parent | f814f84e09191af23bbf8d307f02704e20cc887c [diff] |
am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage * commit 'f814f84e09191af23bbf8d307f02704e20cc887c': DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage