OSDN Git Service
(root)
/
android-x86
/
hardware-interfaces.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fc73b0f
e2dae8c
)
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev
author
Emilian Peev
<epeev@google.com>
Tue, 15 Aug 2017 20:27:50 +0000
(20:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 15 Aug 2017 20:27:50 +0000
(20:27 +0000)
am:
e2dae8c258
Change-Id: I396a157f3522843c3d36870719cb3e5176754dcc
1
2
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
Simple merge