| commit | 4fa40be5ef86cd4b702e410857e91b938df9cd8c | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 20:27:50 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 20:27:50 2017 +0000 |
| tree | a14909095f42d6180b7ec96118d597774acf40a3 | |
| parent | f5da927e197d2b0e371495bc4c5397fec758668d [diff] | |
| parent | e2dae8c2581172001f16a88ad555c401e6b42d34 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258 Change-Id: If093cdfdb9ea0a327a5e67dc0dd40facc466de5c