OSDN Git Service

Merge "Update path to camera ndk headers" am: 9d7eff8334 am: 334bca910c am: 344a7212f...
authorColin Cross <ccross@android.com>
Fri, 5 May 2017 23:07:09 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 23:07:09 +0000 (23:07 +0000)
commit5723a6fb42409197b59b6130d56a520ec32596d4
treec70f923f8615853247d6593ceda068e1a1188145
parentb7a3fd68b6b4b9843fea415a31930a1c0e8ed3d3
parentf91fa2372e67901f5956c5626573bb9d64a21437
Merge "Update path to camera ndk headers" am: 9d7eff8334 am: 334bca910c am: 344a7212f4  -s ours
am: f91fa2372e  -s ours

Change-Id: I49a98fe9946fe3450f678251af65dd92e66cdcb9