am 0de065e6: Merge change 22661 into eclair

Browse Source

Merge commit '0de065e68cc2141513c5b45643123ecb2947858c' into eclair-plus-aosp

* commit '0de065e68cc2141513c5b45643123ecb2947858c':
  SettingsProvider: Fix botched merge from donut to eclair.

...

This commit is contained in:

Mike Lockwood 2009-08-25 16:02:07 -07:00 committed by Android Git Automerger

parent 58fcc677ab ad9437d65c

commit b0e531cd32

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available