OSDN Git Service

Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev
authorEmilian Peev <epeev@google.com>
Tue, 15 Aug 2017 21:11:13 +0000 (21:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Aug 2017 21:11:13 +0000 (21:11 +0000)
commitb7200954cb56520f809540190dd3d9815fbbe2e6
tree7c503690e3e0153d2406c4193c303874bd77459a
parent689b3555c2819e6a869e934de905206721b4c0d3
parent92d3bc1e1ad81c3cb550a5086888eb31350b1728
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev
am: 92d3bc1e1a  -s ours

Change-Id: I1a648056655a978d867b50a53d929c646fc6d035