tree ddfb435e01d75e761522a789a2d1a5d92686f93e
parent 0de4f16540d274d294b3b69dd291157ac3f4181d
parent 341605d91d03c7ff88cac27070c6da309653dc13
author Brian Muramatsu <btmura@google.com> 1303336641 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303336641 -0700

am 341605d9: am e079ac78: am 7afcd821: Merge "Fix for SmsManagerTest" into gingerbread

* commit '341605d91d03c7ff88cac27070c6da309653dc13':
  Fix for SmsManagerTest