tree 248fe46ba36f4be0800c2724049e4ea24e4eb07c
parent ec27e78ddc838d4104d0c7d478bfa0a69baeec6e
parent 7afcd821f282702d82d75779d7dc0d9db298a384
author Brian Muramatsu <btmura@google.com> 1303334870 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303334870 -0700

am 7afcd821: Merge "Fix for SmsManagerTest" into gingerbread

* commit '7afcd821f282702d82d75779d7dc0d9db298a384':
  Fix for SmsManagerTest