commit 02fa227740f321005aae0ec6f2f5fdfa57c9bd7d
author Shuzhen Wang <shuzhenwang@google.com> Wed Apr 27 16:19:35 2016 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Wed Apr 27 16:20:12 2016 -0700
tree 296c53f00469663ae67e2fad0c2db946fcc813c6
parent 780f5c100c6751462ddc0f5360b1db75a7c819b3

QCamera2: HAL3: Fix merge error for AU152

Bug: 28430530
Change-Id: I074459e056855bf784d9b39d99226be79c53052e

QCamera2/HAL3/QCamera3VendorTags.cpp

diff --git a/QCamera2/HAL3/QCamera3VendorTags.cpp b/QCamera2/HAL3/QCamera3VendorTags.cpp
index 8331e71..a84cd76 100644
--- a/QCamera2/HAL3/QCamera3VendorTags.cpp
+++ b/QCamera2/HAL3/QCamera3VendorTags.cpp
@@ -71,7 +71,7 @@
     "org.codeaurora.qcamera3.temporal_denoise",
     "org.codeaurora.qcamera3.av_timer",
     "org.codeaurora.qcamera3.sensor_meta_data",
-    "com.google.nexus.experimental2016"
+    "com.google.nexus.experimental2016",
     "org.codeaurora.qcamera3.dualcam_link_meta_data",
     "org.codeaurora.qcamera3.dualcam_calib_meta_data"
 };