From b951369e7c45fac91bff19b1c5e64ea00d1f7825 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sun, 21 Aug 2016 00:46:28 -0700
Subject: camera2: Merge fixes

Change-Id: I1a69682fa0e1beb393d3e6d64812bab0bf7b68ad
---
 res/values/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ddadda6e2..00fbb855b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -391,12 +391,6 @@
     <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
     <string name="disable_TNR_during_HighQualityNoiseReduction">High Quality Noise Reduction will disable TNR</string>
 
-    <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
-    <string name="disable_CDS_during_SeeMore">SeeMore will disable CDS.</string>
-
-    <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
-    <string name="disable_TNR_during_SeeMore">SeeMore will disable TNR.</string>
-
     <!-- Exposure settings in preference -->
     <string name="pref_exposure_title">Exposure</string>
     <string name="pref_exposure_default" translatable="false">0</string>
-- 
cgit v1.2.3