OSDN Git Service

Merge "Update path to camera ndk headers" am: 9d7eff8334 am: 334bca910c
authorColin Cross <ccross@android.com>
Fri, 5 May 2017 22:55:37 +0000 (22:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 22:55:37 +0000 (22:55 +0000)
am: 344a7212f4  -s ours

Change-Id: Ie4188461c8159b7d478636be9bc5f20ad1510cf8


Trivial merge