commit | e2dae8c2581172001f16a88ad555c401e6b42d34 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 15 20:17:11 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 15 20:17:11 2017 +0000 |
tree | 8db491b63667ea6fd6f09a807c6fcb1c5424eb70 | |
parent | 52af675d143d902e00d6ceb642fb9b532a5f3e4c [diff] | |
parent | be959695e3d73a13e744f872accbafb9c46389a4 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev