tree 1a08f40e1cd142015a237cd0a98542e3026c0614
parent f0bcb9e6f2b18eeebe8ceea49b0d7d0418b0cbbe
parent 3dcde8e4877aac2b69bd1da3dd71e2ef95f7c030
author Yin-Chia Yeh <yinchiayeh@google.com> 1459560646 +0000
committer android-build-merger <android-build-merger@google.com> 1459560646 +0000

Merge "Camera: hide hidden NDK enum values" into nyc-dev
am: 3dcde8e

* commit '3dcde8e4877aac2b69bd1da3dd71e2ef95f7c030':
  Camera: hide hidden NDK enum values

Change-Id: I487900c3233b428427c237eb24dacb1c21cc2b61