OSDN Git Service

Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 15 Aug 2017 20:44:58 +0000 (20:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 15 Aug 2017 20:44:58 +0000 (20:44 +0000)

Trivial merge