tree 987fbb37bdb74fdc0926aa4250344ba738983f59
parent 1ad0fac2f4ca502e66358cee11a46475690ead07
parent 43d7b83ed92d54eeaf81e8e8b554daee1741df7b
author Adam Powell <adamp@google.com> 1296169402 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296169402 -0800

am 43d7b83e: Merge "Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info" into honeycomb

* commit '43d7b83ed92d54eeaf81e8e8b554daee1741df7b':
  Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info