tree dea944ef79b5fba8dac214b522bd2f9a5623b054
parent 09bd0c51e5851a04a2a6daff1a8d1a39c5fc9224
parent 70c8c54767fd80ce080c07763819da1d26b4d6b2
author Brad Fitzpatrick <bradfitz@android.com> 1286763204 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286763204 -0700

am 4216c3c3: am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread

Merge commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635'

* commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635':
  Minor SharedPreference clean-up.