tree 681ce3d5db15f8161147c550662dd5dd03a8ff21
parent f832feb17bd70f84417dc468f573792caf99a127
parent 5c1f01675ca0f4f231f206fc7fe64d353592f726
author Eino-Ville Talvala <etalvala@google.com> 1466546796 +0000
committer android-build-merger <android-build-merger@google.com> 1466546796 +0000

Merge \\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\" into klp-dev am: 22d6575710 am: 4bec033ded
am: 5c1f01675c  -s ours

Change-Id: I9a27186dd8c57aaf4a7c0385c2c521945c6fcd1e