tree 0d22666b8004a8e4ae781514d99b9a00e0059d16
parent 8b35cb563de25a0b5f743de2eeb385a87e95ca6c
parent 4bec033dedcb2e9297001878c7837a3d46d205a3
author Eino-Ville Talvala <etalvala@google.com> 1466546613 +0000
committer android-build-merger <android-build-merger@google.com> 1466546613 +0000

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

Change-Id: I68dd7d3ea94b10104c235007fd03230ef5ae0146