SS_r4: Add Pacific/Noumea.

Also move Majuro to the right place in the list. It's +11, not -11.

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d

DS_r4: Add Pacific/Noumea.

Also move Majuro to the right place in the list. It's +11, not -11.

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d

pre-stable: Remove QuickBoot preference if package isn't available

Change-Id: I6f00b6be8d87c1013d2c695d93e66d276017b0a1

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

alpha: 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