| commit | b8ef3dc52eea062a031a1bc565e295679cc22f5e | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Jun 21 22:38:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 22:38:45 2016 +0000 |
| tree | 6354af6c814817d0597ed8f10057d4316520314c | |
| parent | 90f05048bf0c112900272b178ca8d785b779c168 [diff] | |
| parent | 6ed329ce5ef63fad07f4ea7f5cda01e74f47c172 [diff] |
Merge \\\\\\\\\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\\\\\\\\" into klp-dev am: 22d6575710 am: 4bec033ded am: 5c1f01675c -s ours am: 495ba35a17 -s ours am: f45a909f14 am: aec4789b06 am: 24bf483418 -s ours am: cafbcedf68 am: 834e0e3fae am: 1b14a5eed6 am: 1ee985ced3 -s ours am: 6ed329ce5e Change-Id: I5f92d4d236fdb9408a0434f41695ba4d108c47d7