tree 64f13ae8efe5999f5f95c9c23ba368350d74ee01
parent 7e315466672b34dab1a85301f4870ddae044a9f3
parent 951763824168d08d3f54ba22917756d769486b8b
author Eric Fischer <enf@google.com> 1300139930 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300139930 -0700

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

* commit '951763824168d08d3f54ba22917756d769486b8b':