tree 7451da2838997bb2d1d6545fca98d597f7da181f
parent f5ac9fc41dc2d2c3228e98fe2d2e80d90c4f6904
parent 599e7f8bf95d2f21a966cbff1bf72adf77a90a33
author Andy Huang <ath@google.com> 1371243031 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371243031 -0700

am 599e7f8b: fix occasionally opening the wrong conversation

* commit '599e7f8bf95d2f21a966cbff1bf72adf77a90a33':
  fix occasionally opening the wrong conversation