tree 1f1961bc20bbe6b685c9eea301db807f120a1801
parent b88a38300c7352f9d11c7f03adedb57bd00347f7
parent d3a8a953995b5fbfeb75d1aec5240a8bce497b20
author Shuzhen Wang <shuzhenwang@google.com> 1501727856 +0000
committer android-build-merger <android-build-merger@google.com> 1501727856 +0000

Merge "QCamera2: HAL3: Fix null AF_MODE metadata issue in HFR" into oc-dr1-dev
am: d3a8a95399

Change-Id: I213f03445e05ecee58386e6b19f1bcaf6c4eb215