tree 3e448afc3745b411d160e1f49f648bd90edb484c
parent 0bd7c01a505359bab21712f88aa113e4f1330aa9
parent c2037b753c73d13ca4cb050cd570ba0c5e3b15a7
author Yin-Chia Yeh <yinchiayeh@google.com> 1456344458 +0000
committer android-build-merger <android-build-merger@google.com> 1456344458 +0000

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

* commit 'c2037b753c73d13ca4cb050cd570ba0c5e3b15a7':
  Camera: update NDK header