am 21e30abf: am f2a9e576: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

* commit '21e30abf68554bee9cb143e17f3919432b6eb0c9':