tree 82b1294a6f4942517009a08e0e02a7d8cbb19cc9
parent 4ff0a97ecd27486a6a30eb1e747172ceea27bd53
parent 751b85e8c3b5ff07eaaa6bdbd32517dcdc8f27aa
author Adam Powell <adamp@google.com> 1313538548 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313538548 -0700

am 751b85e8: Merge "Fix bug 5048082 - Conversation doesn\'t scroll after you send a message"

* commit '751b85e8c3b5ff07eaaa6bdbd32517dcdc8f27aa':
  Fix bug 5048082 - Conversation doesn't scroll after you send a message