The Android Open Source Project 2b32afd07d am 5ebaf106: merge from open-source master ...

Merge commit '5ebaf10693725c9dc48219c3c65945b84d74692f' into kraken

* commit '5ebaf10693725c9dc48219c3c65945b84d74692f':
  Fix broken logic in SettingsProvider.parseProviderList.

2010-04-22 13:25:14 -07:00

..

res

Fix 2579461

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

src/com/android/providers/settings

merge from open-source master

2010-04-22 11:43:17 -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

…