| commit | 6ed329ce5ef63fad07f4ea7f5cda01e74f47c172 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Jun 21 22:36:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 22:36:44 2016 +0000 |
| tree | 818206d8aa2b5db785b3dc2c5bf71eb94aadf2c6 | |
| parent | 11ec2fe22d908a8d851b9af536b5278155d88e36 [diff] | |
| parent | 1ee985ced365c12caa69b20622d1738ba2779b9d [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 Change-Id: I52dca422166b0a4061fd2578ca75e7cde0520b5d