tree 4c1f37a1c7f8379b123be0c30383f7207adb33a7
parent dcaeb27238f0c5818eefa576ccad6d638ebc5f1d
parent af64986cb7545dfdaba71bc651e02577a7341080
author Yin-Chia Yeh <yinchiayeh@google.com> 1520373031 +0000
committer android-build-merger <android-build-merger@google.com> 1520373031 +0000

Merge "Camera: add missing stdint header" am: 402bedf403
am: af64986cb7

Change-Id: I8e71e977fda657bb4600db305ba938cfc3d10de3