| commit | e457eb058643d3e2b305a477e5c7d4dbd9e4a165 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Sep 04 09:37:50 2015 -0700 |
| committer | Wei Jia <wjia@google.com> | Fri Sep 04 09:37:50 2015 -0700 |
| tree | 8a98b35ff2308c83d8ad01abe3d370d4d7c9d14c | |
| parent | 4abb48c30cd7821f3397ccd7de8deb3eb645b385 [diff] | |
| parent | 3b8747ca601175da0c94537e49f3097769a09501 [diff] |
resolved conflicts for 3b8747ca to lmp-mr1-ub-dev Merge commit '3b8747ca601175da0c94537e49f3097769a09501' into HEAD libstagefright: sanity check size before dereferencing pointer in Utils.cpp Also remove some CHECK's. Bug: 23680780 (cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4) Change-Id: I5b919716178eb3ba844b21e497b792e6ac61554d