tree 13e816199c9299ef2766ba5c6dfbfaf5b0ef3edf
parent 4051b1c2df459cba75b3487767a235e9f814ef31
parent 9addb6e1b192f27c419da21cf61fc9440ccd5012
author Yin-Chia Yeh <yinchiayeh@google.com> 1518839756 +0000
committer android-build-merger <android-build-merger@google.com> 1518839756 +0000

Merge "Camera NDK: fix headers" am: fa87fc3b31
am: 9addb6e1b1

Change-Id: Ie034ecc0fff542fefcba0ce1f4e09c2b15ef87b8