tree 856d7a7b625973b25453be2f1a57a62e7418a9dd
parent f63f606a8eb5071c4a3260b2e14bace311cd04e6
parent 817545929d4a5498249e2821abdf2a202b9112c8
author Eino-Ville Talvala <etalvala@google.com> 1466546612 +0000
committer android-build-merger <android-build-merger@google.com> 1466546612 +0000

Merge \\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\" into lmp-dev am: f832feb17b  -s ours
am: 817545929d

Change-Id: I0cdde9b06adb1f522783df3e35943fd761090cca