Brad Fitzpatrick c026d5cf2f am 603a1f59: am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread ...

Merge commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22'

* commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22':
  Fix some bugs in SettingsProvider that I introduced the other day.

2010-08-27 15:52:56 -07:00

..

res

am 384759b1: am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo

2010-08-24 18:27:01 -07:00

src/com/android/providers/settings

Fix some bugs in SettingsProvider that I introduced the other day.

2010-08-26 17:51:22 -07:00

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-06 08:53:44 -08:00

AndroidManifest.xml

DO NOT MERGE

2010-03-29 18:12:24 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00