Add system setting for t9 search input locale

Change-Id: I780b3cca1ad2da396b76464a6dab5cc53f621ed2
IconPackHelper: Don't respect an icons original size if too large.

  - Otherwise, if an application isn't following app icon guidelines,
  it can create an OOM situation when creating the new icon based
  on the original resource's height and width.

Change-Id: I9430445da5e393cdbf76ed9ebd9698bf30df6a95
Automatic translation import

Change-Id: I5927a950623fb5ceea027632657880a591cf67af
ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb
Framework : Fix proximity wakeup reference

Change-Id: Ia40ca6fbf6e37fbb3996f2384f725c30b88c2131
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values-ko/cm_strings.xml
	packages/SystemUI/res/values-pl/cm_strings.xml
	services/java/com/android/server/power/PowerManagerService.java

Change-Id: Iff78b966bdcb03df3173f28805857d7bdfdf1463