Update cr_strings.xml
Update cm_strings.xml

"Protected Apps" translation added.
Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12
Settings: Modify & add AOSP JA translation

Change-Id: Ic5ef0aed93cca89b37a91b95fa8debee66fc34a1
Blacklist: Avoid crash when dialog dismissed via back button.

A user usually presses the back button only
when he/she does not want the changes to be saved.
Hence we need to revert the changes that took place
when the dialog is dismissed with back button.

Change-Id: Ifa3ef41f02f11d1e1627071532d8f915e3b445b6
Merge pull request #227 from ValeraSh/cm-11.0

Update RU translation (Settings)
Merge pull request #228 from Basti1337/patch-40

Update cr_strings.xml
Merge pull request #229 from Basti1337/patch-41

Update cm_strings.xml
Slim Recents: Option to show topmost task [2/2]

Change-Id: I46cd6d1141ffb6893c94b10a7f0d9d9f94b92ec1
Build V99
Integrate quite hours active period strings for JA translation

Change-Id: If9c195ecbf9d00f01108185bba1a75be7c115b39
Settings: Modify volume override summary for JA translation

Change-Id: Ia9a14def58c7c195ba5c5cf55983b8d33ec8b5a7
Hover settings (2/2)

- Require full screen
- Exclude non-clearable
- Exclude low priority

Thanks @Der-Schubi for this.
Adapted to crDroid sources

Change-Id: I05584f5d090f7aa044f8b67ba09192984ce83822
Hover notification timeout (2/2)

Allow user to set how much time the hover notification will stay visisible without touch the screen

Change-Id: I6a6fb5609a8dd4f97bfefdbbab38b87de8d2a11a

Conflicts:
	res/values/cr_arrays.xml
Remove lockscreen slide delay option (1/2)

Also enable these options for insecure lockscreen:
* Lock after timeout
* Power button instantly locks
* Owner info

Change-Id: I7737dc9cb1108f7d83b2cea3af9eb313767eb958

Conflicts:
	res/xml/security_settings_chooser.xml
	src/com/android/settings/LockscreenSecuritySettings.java
Cleanup lockscreen security settings

Since we moved lockscreen security settings to a separate fragment,
these changes we have initially made are not longer needed

Change-Id: Iac07850e974e9ea423fd8908ce1e134a9a2508ef
Remove 'More device settings' menu

Change-Id: I86cd84f6f6c408b26c04d92529e9a031c4fed1f7

Conflicts:
	res/xml/settings_headers.xml
Build V100
Update cr_strings.xml
Fix missing nav bar on tablets in landscape mode