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

* commit '048b80994f0199c57cfd5fea9a2d4b1ef87cc1fd':