tree 7f5c8a3afd8e74de7ea38c0384b7ad7d9244234f
parent 043598f6b31e443e83107b0b12d2537416c6e026
parent 2551bcfb449a902a99a593390e90598d6e5f9fbc
author Scott Kennedy <skennedy@google.com> 1378345544 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378345544 -0700

am 2551bcfb: Merge "Remember our scroll position when we return to conv list" into jb-ub-mail-ur10

* commit '2551bcfb449a902a99a593390e90598d6e5f9fbc':
  Remember our scroll position when we return to conv list