tree a159448b4948c000a25686dd2874897b17bdede9
parent 6baac975036cb500f199306204eda7c1f2c5f9d3
parent c9ec7cc1795c3cbb1fbfdaf74dbb99ae9f4ddf37
author Yin-Chia Yeh <yinchiayeh@google.com> 1493367012 +0000
committer android-build-merger <android-build-merger@google.com> 1493367012 +0000

Merge "Camera: use framework header for VideoNativeHandleMetadata" into oc-dev am: d4fc468392
am: c9ec7cc179

Change-Id: Ibed3f21770a48478bd16610828f24181179e1ca2