| commit | 43202e4e9eefa8acc592735caff5818e67f84020 | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 22:32:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 22:32:34 2017 +0000 |
| tree | 23d16a821c4eb8e7c73d837aac63396b5c9ae056 | |
| parent | a370ccb88b1e142f2106e8e1f22ff16a502238b3 [diff] | |
| parent | b7200954cb56520f809540190dd3d9815fbbe2e6 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev am: 92d3bc1e1a -s ours am: b7200954cb -s ours Change-Id: Icca223433f526be20a1ce06cba5c2a372cc9c7b6