OSDN Git Service

Merge "Update path to camera ndk headers" am: 9d7eff8334
authorColin Cross <ccross@android.com>
Fri, 5 May 2017 22:45:33 +0000 (22:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 22:45:33 +0000 (22:45 +0000)
commit344a7212f4e420c238aa694b09a0d085be1dba48
tree6d46a271d4ffb6b9469031bcb3f01445180dba07
parent2de81923ba4443e0eb43b0f09a0d302fd719414d
parent334bca910cf8b136b09a95a48ca08a2e9541269d
Merge "Update path to camera ndk headers" am: 9d7eff8334
am: 334bca910c

Change-Id: I692efffbd9e25e197f0874d69ec8ce991e2e4156