OSDN Git Service

Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38 -s ours
authorYin-Chia Yeh <yinchiayeh@google.com>
Wed, 2 Aug 2017 01:23:38 +0000 (01:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 01:23:38 +0000 (01:23 +0000)
am: e2f3270db5  -s ours

Change-Id: I1007702b75ad0e0065ee14691a2984afe688fbd5


Trivial merge