tree e9e86a618089d62e8e0b4d07c5f1e429424529d9
parent b9c17fcff7b14b2c20bd368dcd15c30986b08a90
parent 741aeff98aee206a8c996cf03ca29bc018d0a292
author Yin-Chia Yeh <yinchiayeh@google.com> 1456344128 +0000
committer android-build-merger <android-build-merger@google.com> 1456344128 +0000

Merge "Camera: update NDK header" into nyc-dev
am: 741aeff98a

* commit '741aeff98aee206a8c996cf03ca29bc018d0a292':
  Camera: update NDK header