OSDN Git Service

Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am:...
authorEmilian Peev <epeev@google.com>
Tue, 15 Aug 2017 21:10:24 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Aug 2017 21:10:24 +0000 (21:10 +0000)
commit689b3555c2819e6a869e934de905206721b4c0d3
tree7c503690e3e0153d2406c4193c303874bd77459a
parentfc371311ad1397e7a0131ab6d71f7aef58c01ba9
parent5d18c87e883dfd9f740ca42876e8ccd7c744ba21
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258
am: 5d18c87e88  -s ours

Change-Id: Ib03c1512099ec88e1c65672dadbe29ef3b9d9086