tree 15cbbe04ad4286e32e79ce14dde12301af011c98
parent dacdb6e586beba067fe602850e59399f4887e69c
parent 5da789a6735a9e06e6cd6b72b09c7de9bf7715a8
author Mike Lockwood <lockwood@android.com> 1300150142 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300150142 -0700

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

* commit '5da789a6735a9e06e6cd6b72b09c7de9bf7715a8':