The Android Open Source Project 762d30a313 Merge branch 'open_source' into google_internal ...

Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes

2009-03-29 08:55:27 -07:00

..

SettingsProvider

Merge commit 'korg/cupcake'

2009-03-27 15:38:40 -07:00

SubscribedFeedsProvider

Automated import from //branches/master/...@141380,141380

2009-03-24 20:10:17 -07:00