OSDN Git Service

Merge "Camera: reset callback after test done" into oc-dr1-dev
authorYin-Chia Yeh <yinchiayeh@google.com>
Thu, 27 Jul 2017 01:15:25 +0000 (01:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 01:15:25 +0000 (01:15 +0000)
am: eba1407b55  -s ours

Change-Id: Ia0b6863fa82f33d03903f6e17739f8ad339246c5


Trivial merge