diff options
| author | Daniel Sandler <dsandler@android.com> | 2015-08-15 00:16:41 -0400 |
|---|---|---|
| committer | Geoff Mendal <mendal@google.com> | 2015-08-15 00:03:09 -0700 |
| commit | 8dcda391c79e8c2fd20a87834f1f61645aa771ea (patch) | |
| tree | d8627d43359f158bc82ea3aff9e02a7838a4ab41 /core/res | |
| parent | 479c482ca1788235afc776125eb6a79f1d9281c8 (diff) | |
| download | frameworks_base-8dcda391c79e8c2fd20a87834f1f61645aa771ea.zip frameworks_base-8dcda391c79e8c2fd20a87834f1f61645aa771ea.tar.gz frameworks_base-8dcda391c79e8c2fd20a87834f1f61645aa771ea.tar.bz2 | |
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/symbols.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index dae5db0..50a4978 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> |