OSDN Git Service

Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev
authorEmilian Peev <epeev@google.com>
Tue, 15 Aug 2017 20:27:50 +0000 (20:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Aug 2017 20:27:50 +0000 (20:27 +0000)
commit5d18c87e883dfd9f740ca42876e8ccd7c744ba21
tree7cef56c1a7c6b933a768ecdb04850a765ecb037f
parentfc73b0fcbdf18c07cec8f283ccd636feec416b9a
parente2dae8c2581172001f16a88ad555c401e6b42d34
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev
am: e2dae8c258

Change-Id: I396a157f3522843c3d36870719cb3e5176754dcc
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp