| commit | 608728e42ee17bb8889f7207638178f390c26dd5 | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 20:33:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 20:33:44 2017 +0000 |
| tree | d37374fd98b2216488283e0612c46dcefed845ed | |
| parent | 390ba0a0337dc2ea54154126b27331793ae8fad6 [diff] | |
| parent | 5d18c87e883dfd9f740ca42876e8ccd7c744ba21 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258 am: 5d18c87e88 Change-Id: Ie9f5c727bff3a012f2c547066d2385116a765ae2