Scott Main d9ec8eba56 resolved conflicts for merge of 7008b7c1 to master ...

Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e

2010-10-04 18:42:49 -07:00

..

appwidgets

docs: consistency fixit for the quickview boxes in the dev guide

2010-10-04 13:30:30 -07:00

data

fix code snippet error

2010-09-03 11:03:42 -07:00

drawing

…

graphics

…

intents

docs: consistency fixit for the quickview boxes in the dev guide

2010-10-04 13:30:30 -07:00

location

…

manifest

…

media

docs: consistency fixit for the quickview boxes in the dev guide

2010-10-04 13:30:30 -07:00

processes

…

providers

docs: consistency fixit for the quickview boxes in the dev guide

2010-10-04 13:30:30 -07:00

resources

am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo

2010-09-23 13:10:22 -07:00

search

docs: consistency fixit for the quickview boxes in the dev guide

2010-10-04 13:30:30 -07:00

security

DO NOT MERGE Clarify the explanation of Android's security design.

2010-09-27 14:12:35 -07:00

sensors

…

testing

resolved conflicts for merge of 7008b7c1 to master

2010-10-04 18:42:49 -07:00

ui

resolved conflicts for merge of 7008b7c1 to master

2010-10-04 18:42:49 -07:00

views

…

wireless

docs: consistency fixit for the quickview boxes in the dev guide

2010-10-04 13:30:30 -07:00

fundamentals.jd

resolved conflicts for merge of 7008b7c1 to master

2010-10-04 18:42:49 -07:00

index.html

…