Scott Main c49f864695 resolved conflicts for merge of aaf8a9d8 to master

2009-12-16 11:08:26 -08:00

..

appwidgets

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

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

data

auto import from //depot/cupcake/@135843

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

drawing

auto import from //depot/cupcake/@135843

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

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

donut snapshot

2009-05-20 11:28:04 -07:00

manifest

resolved conflicts for merge of aaf8a9d8 to master

2009-12-16 11:08:26 -08:00

media

Fix all typos (found by script) in the Android documentation.

2009-08-21 13:10:55 -07:00

processes

auto import from //depot/cupcake/@135843

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

providers

Fix all typos (found by script) in the Android documentation.

2009-08-21 13:10:55 -07:00

resources

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

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

security

auto import from //depot/cupcake/@135843

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

sensors

auto import from //depot/cupcake/@135843

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

ui

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

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

views

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

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

wireless

docs: add images used in BT developer guide.

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

fundamentals.jd

manual merge of 85a2c7f because of trivial conflict

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

index.html

auto import from //depot/cupcake/@135843

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