Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 8ad3e817 to mnc-dr-dev

Browse Source 
Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7
This commit is contained in:
Daniel Sandler
2015-08-15 00:16:41 -04:00
committed by Geoff Mendal
parent 479c482ca1
commit 8dcda391c7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/symbols.xml
View File

@@ -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>