tree 7bf5d9a92340eec0d6117ac3bd03c3f3bcb55e48
parent 30689c9e4c7cbcfb1f537f224ab1b50f5fe0efa6
parent 470241b168a9db7514bc0df775109db591836d4b
author Yin-Chia Yeh <yinchiayeh@google.com> 1464891457 +0000
committer android-build-merger <android-build-merger@google.com> 1464891457 +0000

Merge "Camera: Add media/camera NDK documents" into nyc-dev
am: 470241b168

* commit '470241b168a9db7514bc0df775109db591836d4b':
  Camera: Add media/camera NDK documents

Change-Id: Ib66856fba84301834a81f0c361f5244bd152eeb3