tree 0e4528a9b0e6d764b0e149a1eb49602b8b464928
parent 8066ab49a4fd65d65e74009f2c70dad813900e82
parent 811029f71d0deb2f127cff77aaf221768d3d4c2f
author Yin-Chia Yeh <yinchiayeh@google.com> 1504915172 +0000
committer android-build-merger <android-build-merger@google.com> 1504915172 +0000

Merge "Camera: fix race in onRepeatingRequestError callback" into oc-mr1-dev am: f23334869d
am: 811029f71d

Change-Id: Ib156c92bde8571cad70b1fe2cef0f03d9eae54b4