am 3e22047d: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

* commit '3e22047d1c32f8ecf6299047f5a1323659d00110':