tree 856d7a7b625973b25453be2f1a57a62e7418a9dd
parent 4ba6f225ec44a20801c083ed461fdd2e106dbf35
parent f45a909f14380be824e28e8c29774f404aeb40b0
author Eino-Ville Talvala <etalvala@google.com> 1466547244 +0000
committer android-build-merger <android-build-merger@google.com> 1466547244 +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 am: 495ba35a17  -s ours
am: f45a909f14

Change-Id: I5f316563ea3551f03409d95daf21aab453e60711