| commit | 689b3555c2819e6a869e934de905206721b4c0d3 | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 21:10:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 21:10:24 2017 +0000 |
| tree | 7c503690e3e0153d2406c4193c303874bd77459a | |
| parent | fc371311ad1397e7a0131ab6d71f7aef58c01ba9 [diff] | |
| parent | 5d18c87e883dfd9f740ca42876e8ccd7c744ba21 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258 am: 5d18c87e88 -s ours Change-Id: Ib03c1512099ec88e1c65672dadbe29ef3b9d9086