| commit | 5cb3dc50ab663efd855b9dfc05b25c1a2250d9e8 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Sep 04 17:55:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 17:55:43 2015 +0000 |
| tree | 76fe806d031a362223877e0a19edef2cd02f2872 | |
| parent | e6eeff25562cecb668110b446d6114098e27370d [diff] | |
| parent | e457eb058643d3e2b305a477e5c7d4dbd9e4a165 [diff] |
am e457eb05: resolved conflicts for 3b8747ca to lmp-mr1-ub-dev * commit 'e457eb058643d3e2b305a477e5c7d4dbd9e4a165': DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp