| commit | c04f3cb24c04ea8be7cc2db274d987b1ee489913 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Sep 04 18:01:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 18:01:45 2015 +0000 |
| tree | 0b1785e26deb4dcc6ae55fb74e63d66feb51a819 | |
| parent | 50d12164efe3e4df9a1d994afdeb4779ce0f63c9 [diff] | |
| parent | 5cb3dc50ab663efd855b9dfc05b25c1a2250d9e8 [diff] |
am 5cb3dc50: am e457eb05: resolved conflicts for 3b8747ca to lmp-mr1-ub-dev * commit '5cb3dc50ab663efd855b9dfc05b25c1a2250d9e8': DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp