From 8dcda391c79e8c2fd20a87834f1f61645aa771ea Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Sat, 15 Aug 2015 00:16:41 -0400
Subject: [PATCH] resolved conflicts for merge of 8ad3e817 to mnc-dr-dev

Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7
---
 core/res/res/values/symbols.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index dae5db0216bcb..50a497833cee8 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2321,4 +2321,6 @@
   <!-- Gesture -->
   <java-symbol type="integer" name="config_cameraLaunchGestureSensorType" />
   <java-symbol type="string" name="config_cameraLaunchGestureSensorStringType" />
+
+  <java-symbol type="drawable" name="platlogo_m" />
 </resources>