| commit | eaace23ca2b27dd6e0c44702c2d54e7f9fbcacb2 | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 22:40:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 22:40:44 2017 +0000 |
| tree | 21130e4b3a8a365599cdea8d423658394497ef7f | |
| parent | 9c0a60ce57627b247d5b8e51745c8cb585320546 [diff] | |
| parent | 43202e4e9eefa8acc592735caff5818e67f84020 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev am: 92d3bc1e1a -s ours am: b7200954cb -s ours am: 43202e4e9e Change-Id: I08c2dd7ef1a0a5ad576b22f700242b7e17dce18b