pie 2.0

Change-Id: I2bf0093751197953f1a0b39c76c4bad3846062be

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/dimens.xml