tree 7b398d98ec867d340fc67bd69d89a52b53d35618
parent 8f5007ba4789e0c9e1a620e7211fa24143a66a0a
parent 3a2952baf1151f3d96d46cb3bbed600a087e14e8
author Brad Fitzpatrick <bradfitz@android.com> 1282870476 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1282870476 -0700

Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread