am 04da3dc6: am 58162eba: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

* commit '04da3dc67ea9342b0864de684aed2efdd98c2412':