volume key adjust sound
move everything into one preference screen
move rastapop settings into system dashboard category
minor strings edits
navigation bar: custom height
volume rocker wake
Prevent factory reset for short passwords in CryptKeeper

Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java

Conflicts:
	src/com/android/settings/CryptKeeper.java
status bar brightness control
configurable advanced reboot menu
move kill app long press back into rastapop/system settings
battery level text: edit settings to match https://github.com/rascarlo/android_frameworks_base/commit/fcc6ca48f753009f653cbb8b8d84bb6772530b8e
Merge remote-tracking branch 'AOSP/lollipop-release' into lollipop-ras-mr1
Merge remote-tracking branch 'AOSP/lollipop-release' into psoa_r2