tree 436b51aaabedf3d682181ba37852b1f814a8d5f5
parent e7884d68a613e579a12a52455f6b5b13a90a0f8a
parent a2f2141c84923e34e003bec92b7435ea79b02ee8
author Brad Fitzpatrick <bradfitz@android.com> 1283543384 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283543384 -0700

am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp

* commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8':
  More SharedPreferences commit() -> apply() changes.