Scott Main 952e39578d Merge commit '2f7b69aa' into manualmerge ...

Conflicts:
	docs/html/guide/topics/ui/themes.jd

2010-02-03 16:37:03 -08:00

..

appwidgets

am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair

2009-12-15 15:04:00 -08:00

data

…

drawing

…

graphics

am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair

2009-12-15 15:04:00 -08:00

intents

sdk doc change for esr: Cleanup for resources tab content.

2009-12-15 19:24:58 -08:00

location

…

manifest

am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair

2010-01-28 16:52:43 -08:00

media

…

processes

…

providers

…

resources

am 5f6002ec: am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair

2010-01-07 12:37:15 -08:00

security

…

sensors

…

ui

Merge commit '2f7b69aa' into manualmerge

2010-02-03 16:37:03 -08:00

views

am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair

2009-12-15 15:04:00 -08:00

wireless

docs: update the Bluetooth guide with links to the sample

2009-12-16 18:48:02 -08:00

fundamentals.jd

manual merge of 85a2c7f because of trivial conflict

2009-09-01 13:52:19 -07:00

index.html

…