tree a0d7bbdf8c4ebb152ed3c046b35fb4b1612c6d0e
parent aab7375799e76ec2e429fbd8224d0c6e8cc96463
parent b1104b3713febb75164938a465c3022e1879245f
author Brad Fitzpatrick <bradfitz@android.com> 1283883301 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283883301 -0700

am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread

Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp

* commit 'b1104b3713febb75164938a465c3022e1879245f':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes