| commit | 9c0a60ce57627b247d5b8e51745c8cb585320546 | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 22:40:22 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 22:40:22 2017 +0000 |
| tree | 21130e4b3a8a365599cdea8d423658394497ef7f | |
| parent | df61c2ba30a2946c6fc2f47af42a3e03dcb5aebb [diff] | |
| parent | a370ccb88b1e142f2106e8e1f22ff16a502238b3 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258 am: 5d18c87e88 -s ours am: 689b3555c2 -s ours am: a370ccb88b Change-Id: Iaeff885c0ed0b6509c2f84f8f23ade2ebf43eeaa