| commit | b7200954cb56520f809540190dd3d9815fbbe2e6 | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 21:11:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 21:11:13 2017 +0000 |
| tree | 7c503690e3e0153d2406c4193c303874bd77459a | |
| parent | 689b3555c2819e6a869e934de905206721b4c0d3 [diff] | |
| parent | 92d3bc1e1ad81c3cb550a5086888eb31350b1728 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev am: 92d3bc1e1a -s ours Change-Id: I1a648056655a978d867b50a53d929c646fc6d035