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

* commit 'b4a96805d69b1f6281ece568b07927da2dd50872':