Elliott Hughes e6cd6aef23 am 22ea4c41: resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp ...

* commit '22ea4c41ae79b52dac3d0c3789e6587bc4d6a43a':
  Fix percentage formatting throughout Settings.

2014-10-04 16:43:09 +00:00

..

accessibility

…

accounts

…

applications

…

bluetooth

…

dashboard

…

deviceinfo

…

drawable

…

fuelgauge

…

inputmethod

…

location

…

net

…

nfc

…

notification

…

print

…

quicklaunch

…

search

…

sim

…

tts

…

users

…

voice

…

vpn2

…

wfd

…

widget

…

wifi

…

AccountPreference.java

…

ActiveNetworkScorerDialog.java

…

ActivityPicker.java

…

AirplaneModeEnabler.java

…

AirplaneModeVoiceActivity.java

…

AllowBindAppWidgetActivity.java

…

ApnEditor.java

…

ApnPreference.java

…

ApnSettings.java

…

ApplicationSettings.java

…

AppListPreference.java

…

AppPicker.java

…

AppWidgetLoader.java

…

AppWidgetPickActivity.java

…

BandMode.java

…

BatteryInfo.java

…

BrightnessPreference.java

…

BugreportPreference.java

…

ButtonBarHandler.java

…

ChooseLockGeneric.java

…

ChooseLockPassword.java

…

ChooseLockPattern.java

…

ChooseLockSettingsHelper.java

…

ConfirmDeviceCredentialActivity.java

…

ConfirmLockPassword.java

…

ConfirmLockPattern.java

…

CreateShortcut.java

…

CredentialStorage.java

…

CryptKeeper.java

…

CryptKeeperConfirm.java

…

CryptKeeperSettings.java

…

DataUsageSummary.java

…

DateTimeSettings.java

…

DateTimeSettingsSetupWizard.java

…

DefaultRingtonePreference.java

…

DevelopmentSettings.java

…

DeviceAdminAdd.java

…

DeviceAdminSettings.java

…

DeviceInfoSettings.java

…

DialogCreatable.java

…

Display.java

…

DisplaySettings.java

…

DreamBackend.java

…

DreamSettings.java

…

EditPinPreference.java

…

EventLogTags.logtags

…

HelpUtils.java

…

HighlightingFragment.java

…

HomeSettings.java

…

IccLockSettings.java

…

IconPreferenceScreen.java

…

LocalePicker.java

…

ManagedProfileSetup.java

…

MasterClear.java

…

MasterClearConfirm.java

…

MediaFormat.java

…

MonitoringCertInfoActivity.java

…

NsdEnabler.java

…

OwnerInfoSettings.java

…

PinnedHeaderListFragment.java

…

PointerSpeedPreference.java

…

PrivacySettings.java

…

ProgressCategory.java

…

ProgressCategoryBase.java

…

ProxySelector.java

…

RadioInfo.java

…

RegulatoryInfoDisplayActivity.java

…

RestrictedSettingsFragment.java

…

ScreenPinningSettings.java

…

SecuritySettings.java

…

SelectableEditTextPreference.java

…

SetFullBackupPassword.java

…

Settings.java

…

SettingsActivity.java

…

SettingsLicenseActivity.java

…

SettingsPreferenceFragment.java

…

SettingsSafetyLegalActivity.java

…

SmsDefaultDialog.java

…

SubSettings.java

…

TestingSettings.java

…

TestingSettingsBroadcastReceiver.java

…

TetherSettings.java

…

TrustAgentSettings.java

…

TrustAgentUtils.java

…

TrustedCredentialsSettings.java

…

UsageAccessSettings.java

…

UsageStatsActivity.java

…

UserDictionarySettings.java

…

UserSpinnerAdapter.java

…

Utils.java

…

VoiceInputOutputSettings.java

…

VoiceSettingsActivity.java

…

WallpaperTypeSettings.java

…

WarnedListPreference.java

…

WirelessSettings.java

…

ZonePicker.java

…