commit | 1ee985ced365c12caa69b20622d1738ba2779b9d | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Tue Jun 21 22:30:09 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 22:30:09 2016 +0000 |
tree | 3b36892cd4dd5cce128245c957def1637665cfde | |
parent | 9f308209fa718fdd50d326231cbbc780ca305179 [diff] | |
parent | 1b14a5eed62ff0d038843a612c4662033af8d656 [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 Change-Id: Ib01c5b09632371e0771ddd7b38d43b2338133f72