commit | 030d058cb18fa70b3584dfd2e1e6a8b31b26f2dc | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Thu Aug 20 19:47:13 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:47:13 2015 +0000 |
tree | 903b0a6e352c23f5cc02cbd9c10ee55b0457380c | |
parent | 79c7207e77a9dd510bc4f9e3445fbf5e715e2dbb [diff] | |
parent | 7a4cfed77b138db03bc79fc6ef2be83db7d1831b [diff] |
am 7a4cfed7: am 49cfd200: am 35fbcdd6: am 3d97de8c: am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev * commit '7a4cfed77b138db03bc79fc6ef2be83db7d1831b': libstagefright: Fix crash in convertMetaDataToMessage