Amith Yamasani 61f280d520 am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo ...

Merge commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3' into kraken

* commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3':
  Fix an upgrade bug in SettingsProvider.

2010-04-13 11:54:04 -07:00

..

res

Fix 2579461

2010-04-07 20:43:54 -07:00

src/com/android/providers/settings

Fix an upgrade bug in SettingsProvider.

2010-04-12 15:49:12 -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

…

NOTICE

…