am a388a324: Merge branch \'gingerbread-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp

Merge commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946'

* commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946':