am 1beba231: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp

* commit '1beba23120a914aa02aa18569de0c06818bf5d09':