tree aa81bff48995a407a4228a0622f34f6f7cdda5bf
parent f4f37a3f279784771c9bd1e8e2b21a56735b297c
parent 44a2f1a857e2e4daac551ac03a6efa1ad92c2ea1
author The Android Open Source Project <initial-contribution@android.com> 1339080965 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339080965 -0700

am 44a2f1a8: Reconcile with jb-release

* commit '44a2f1a857e2e4daac551ac03a6efa1ad92c2ea1':
  Crash on deleting messaging thread