tree 3da1d8d0a16d08bae8a68c1b9a23cd5a4a40992c
parent a8b6129f0c1fb1450aeb70eff681c7ef0e9a5f9e
parent 31a40d0f6cb2e96e0c63cea8645991f67307ba5f
author Brad Fitzpatrick <bradfitz@android.com> 1283217902 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283217902 -0700

am 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread

Merge commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4'

* commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4':
  Renaming SharedPreferences$Editor.startCommit to apply