Merge branch 'origin/kitkat'

Conflicts:
	core/java/android/inputmethodservice/InputMethodService.java
	packages/SystemUI/res/values/strings_custom.xml
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java

Change-Id: I4d59912ed714e2f2c8ba885f8f26e84dc331f405