fix npe with Xposed Framework activity
Revert "QuickSettings : add EqualizerTile (2/2)"

This reverts commit fb0a5b1c2a48b5e18ceb22460d2370a3717b41a6.

Conflicts:
	res/values/slim_strings.xml
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java
Revert "QuickSettings : CPUFreq Tile (2/2)"

This reverts commit df97e90a29311058d848fa2a97c63050e7a74f5a.

Conflicts:
	res/values/slim_strings.xml
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java
Settings: translation- RU

I73dc3d7bccac27a4ea18097fd0f8ce3d247f090d

Fixed seconds quantity for Russian

Change-Id: Idccf357833c6c308d06a466e8ba4bfec178bf242
Settings: Update DE translation

Change-Id: I05410f90374c605e528e4de9e66c7a79236954ba

Conflicts:
	res/values-de/slim_strings.xml
Settings: translation - RU

Ic87099be744255309674ca855a9376c715903781

Change-Id: Id1a7da429f5dcc628484a3909e337431960fe5fb
Settings: Shake Security ES translations

PS2: Remove tabs

Change-Id: I7b8dac236ffbfb533fd89fcaf334a9c95e0a12f5
Settings: More shake sensitivity adjustments (2/2)

As requested by our users

Change-Id: I8543f4a103f312f0067f3c88e20e4d762ba4e813
Settings: ES translations

Change-Id: Id6a30a6f60175d0645eb57ecee47cbf2ad299759
Settings: Remove "Make pattern visible" regardless.

  - Previous logic depended on all pattern lock elements to be
    null prior to removing the preferences. Remove them one by
    one if they exist now.

  - PS #3: Add braces.

Change-Id: If34bc305eddda2985b37bd55349e4bb5d9b63154

Conflicts:
	src/com/android/settings/SecuritySettings.java
Settings: Allow access for external apps to launch ThemeSettings Fragment directly

Change-Id: I93b676d3eb570c7064eeb4217c8e420a186c8e32

Conflicts:

	src/com/android/settings/Settings.java

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/Settings.java
Revert "Revert "QuickSettings : add EqualizerTile (2/2)""

This reverts commit 67069766d32c5f08c53c1c3d9f83354f2cee7bc7.

Conflicts:
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java
Add back Fast Torch
Bluetooth: Acquire wakelock to turn on lcd during Connection

This patch acquires wakelock to turn on LCD display of DUT if screen
is off during connection access request for PBAP/MAP. Without this
patch it was observed that if screen was off, lcd remained off for
incoming connection access request from remote device and user only
was hearing notification sound without lcd being lit up.

Change-Id: I87c296fce4cd8e0c133f74169d991eee263fed08
CRs-Fixed: 650261
Bluetooth: Fix for device gets stuck in pairing

Fix for device gets stuck in pairing when trying to pair to two
devices one after the other or simultaneous. Now second pairing
is blocked when first pairing is ongoing.

Change-Id: Ib7e6788243a38b3a0dd864bee2b0797305468e27
CRs-fixed: 610056
Add app moving setting to the menu in Settings -> Apps

Change-Id: I5fdbc6c46a6ba7f348c0310eb83e96a2784256df

Conflicts:
	res/values/slim_strings.xml
Enable moving applications to an external volume

* Always enable moving applications to an external volume if it is
  available and mounted

Change-Id: Ia683eda30338dfad0d7e78087d42d7e512fa83e4
Slim Recents: Option to show topmost task [2/2]
Settings: Volume Control to SlimActions Shortcut (2/2)

Change-Id: I9979e7de77f783868bc8dd0c65f36af069559d5c
Revert "QuickSettings : add EqualizerTile (2/2)"

This reverts commit ef6879523749794e22e9ed81651bad9284d64458.