| commit | 311b46f57e43c62615d0abf78546ede5491b5db0 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Jun 21 23:32:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 23:32:46 2016 +0000 |
| tree | 451a20481cb6b78d4cfeb038703c3ce921e7be0a | |
| parent | e88f9e6b8b2ccb816db0eb59b02dc3ac931e168e [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: I7e50cd1e2e7cff489d7264e33d7cfe8a3b34e98b