| commit | 136366d2f0f058c935920f460cd185c33bf5e863 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri May 13 21:54:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 13 21:54:53 2016 +0000 |
| tree | ecf21cd832114916b6e8f29b38372f2dff1f1f7b | |
| parent | 3e077799b70249ae73b0903eeff596f1f3ebf58b [diff] | |
| parent | 5ac24ba7139382abc358847ca7d7b4e0569cfe57 [diff] |
Merge "Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0 am: f518e50178 am: eb919fc1d3 am: 7e580879e0 am: a78d7f2d49 am: e47ede5c6b am: 361c6c4276 am: ded36eb69b" into nyc-mr1-dev-plus-aosp am: 5ac24ba713 * commit '5ac24ba7139382abc358847ca7d7b4e0569cfe57': Change-Id: Ib13ebcf032d5eb51c402c9d06217680d27a9b96a