| commit | 834e0e3fae9929048681abd295f3a1fbe0bda0e5 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Jun 21 22:22:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 22:22:21 2016 +0000 |
| tree | ae289212613d613ce0d6b250d453348def6dde15 | |
| parent | e933b06ea8c6791630e26ccc536faf5004cb5bd8 [diff] | |
| parent | cafbcedf68ed7063ae106d3b44ced5efa1f6b483 [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 Change-Id: I936c97bb379b68a4ecb85c0ce7f82f60f865aac0