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