| commit | d20434bfaca219db39627931cb9e11859c77c9de | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 22:31:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 22:31:44 2017 +0000 |
| tree | 23d16a821c4eb8e7c73d837aac63396b5c9ae056 | |
| parent | 6a18b403b2918e081fa94e8b5f1f5b5572d01675 [diff] | |
| parent | fc371311ad1397e7a0131ab6d71f7aef58c01ba9 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-mr1-dev am: fc371311ad Change-Id: If8cb5a802d75353e116b4debd3a4b7f304fd8eea