commit | 92d3bc1e1ad81c3cb550a5086888eb31350b1728 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 15 20:44:58 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 15 20:44:58 2017 +0000 |
tree | 7cef56c1a7c6b933a768ecdb04850a765ecb037f | |
parent | 5d18c87e883dfd9f740ca42876e8ccd7c744ba21 [diff] | |
parent | 3a5a3c61662d01e543ebdf0247d10f0dc19fe317 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev