| commit | c840cf40b95c41a31d5e82d087f0f77aa3cfb3c2 | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 21:01:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 21:01:04 2017 +0000 |
| tree | d37374fd98b2216488283e0612c46dcefed845ed | |
| parent | d5f4f36d82a6d68d98f806f30353a1c73af7862c [diff] | |
| parent | 92d3bc1e1ad81c3cb550a5086888eb31350b1728 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev am: 92d3bc1e1a -s ours Change-Id: Ic640f0f386366ed713434db60e7337d71e24e7a5