tree 2fe102824ea9871298fe25bc5918c28a9fb164da
parent cf5c9d616ca4d541110954931d54219bcb1c3da3
parent 3d22b204f2a57855a06b5ac83b30124d025c16bf
author Ari Hausman-Cohen <arihc@google.com> 1539307060 -0700
committer android-build-merger <android-build-merger@google.com> 1539307060 -0700

Merge "camera: avoid narrowing of the ioctl request" am: eef57caed9
am: 3d22b204f2

Change-Id: Ia143066265775612b1ff27002106a15bf9478c19