tree 840358c5537173a97a09659815656fae5e4b4ce7
parent 0c52c9878c53d06f547922dbcf893b9b2998dfcd
parent 5c8257a855f7ba55ca530e8353d8bfc8c1c0d61e
author James Wilson <james.wilson@motorola.com> 1300141512 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300141512 -0700

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

* commit '46a3642251b5fd6c37720284108304e69f0f8166':