tree 0105878eec23ccfe6352b7207acd0bd53f9997df
parent c3b1ec9079abcc5f9c8d2584e96597afeb428723
parent 05507e67712c67b2127db0c3fbfd42a3003ded85
author Shuzhen Wang <shuzhenwang@google.com> 1504813710 +0000
committer android-build-merger <android-build-merger@google.com> 1504813710 +0000

Merge "QCamera2: HAL3: Add scene distance metadata" into oc-mr1-dev am: f4c5624341
am: 05507e6771

Change-Id: I97a9d853033ad19bc51941f254c29e64f2426d11