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

* commit '30e9f8807e6c7fd7f450b2d4ee91badb1afa4d77':