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

am a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev

Browse Source 
* commit 'a5e012e6236aaeabd6d00fa7c6b29ec146ffd764':
  resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
This commit is contained in:
Geoff Mendal
2015-08-16 02:39:19 +00:00
committed by Android Git Automerger
parent eb694bb6e6 a5e012e623
commit 567139efb3
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2323,4 +2323,5 @@
<java-symbol type="string" name="config_cameraLaunchGestureSensorStringType" /> <java-symbol type="string" name="config_cameraLaunchGestureSensorStringType" />
<java-symbol type="string" name="config_networkPolicyNotificationComponent" /> <java-symbol type="string" name="config_networkPolicyNotificationComponent" />
<java-symbol type="drawable" name="platlogo_m" />
</resources> </resources>