tree 8b53cf3d706fa5d5a782fd2316b46574695db0c5
parent 7c8823db999974195e04b9d1a4a93885018faf1a
parent 2683264a6d46a0238e3486278d1650fc2da9051e
author Emilian Peev <epeev@google.com> 1506106693 +0000
committer android-build-merger <android-build-merger@google.com> 1506106693 +0000

Merge "QCamera2: HAL3: Avoid race condition during HFR video stop" into oc-mr1-dev
am: 2683264a6d

Change-Id: Ie2bf46a70d18af4f2c27537ebfb7c957a76d2b86