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)
commitf91fa2372e67901f5956c5626573bb9d64a21437
tree9cb8b41d5548a5b7cd2f3655fcd278c10ae82f31
parent292f818fa66550649d9b80204c48169c0d7b40b2
parent344a7212f4e420c238aa694b09a0d085be1dba48
Merge "Update path to camera ndk headers" am: 9d7eff8334 am: 334bca910c
am: 344a7212f4  -s ours

Change-Id: Ie4188461c8159b7d478636be9bc5f20ad1510cf8