tree 908a387b89c01e5e356f9cbae74ded95e7ca6c51
parent 0b3977f87b10fd78cffa0c39aaf787bfe6d108c7
parent 5b48223d0e8b8becea0c120895d964e6472b3552
author Suchi Amalapurapu <asuchitra@google.com> 1256218713 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256218713 -0700

am 5b48223d: Merge change I14e833fa into eclair

Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2

* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
  If we fail to persist the current settings and fall back to the back settings file