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)
commit8d1ef0505f64e2a371dca80d13b518d811380f7c
tree47fddecc7f2bc7333b8a9ce2d3cd867312e8fe68
parentb7af89f83830f46864efbf95d80210e48f07450a
parenteba1407b55068f3fe5344b150f38cc0e33d47586
Merge "Camera: reset callback after test done" into oc-dr1-dev
am: eba1407b55  -s ours

Change-Id: Ia0b6863fa82f33d03903f6e17739f8ad339246c5