am 8bfdd9a6: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp

* commit '8bfdd9a65102c13e6a0786d16bf27083be8a98ff':