| commit | a370ccb88b1e142f2106e8e1f22ff16a502238b3 | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 22:32:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 22:32:13 2017 +0000 |
| tree | 23d16a821c4eb8e7c73d837aac63396b5c9ae056 | |
| parent | d20434bfaca219db39627931cb9e11859c77c9de [diff] | |
| parent | 689b3555c2819e6a869e934de905206721b4c0d3 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258 am: 5d18c87e88 -s ours am: 689b3555c2 -s ours Change-Id: Iccf5d7d01a272b9f6bd04783f2db9c8724b8985b