Katie McCormick ce7c05e842 resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp ...

Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc

2011-02-10 12:38:07 -08:00

..

admin

cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df

2010-12-14 16:39:22 -08:00

advanced

cherrypick Change-Id: I1365c6c45f8e1f75ee4afbc52c32778d21b97be4 from master

2011-01-14 14:07:29 -08:00

appwidgets

Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide

2011-02-07 21:03:04 -08:00

data

cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e

2010-12-14 17:34:00 -08:00

drawing

auto import from //depot/cupcake/@135843

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

fundamentals

docs: remove and correct parent links for fundamental docs

2011-02-08 14:05:54 -08:00

graphics

Doc change: fixing links and code indents

2011-01-21 12:02:07 -08:00

intents

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

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

location

Doc change: fixing links set 2

2011-01-07 18:56:10 -08:00

manifest

Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide

2011-02-07 21:03:04 -08:00

media

Fix documentation errors

2010-12-20 09:22:01 -08:00

network

cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8

2011-02-08 09:39:30 -08:00

processes

auto import from //depot/cupcake/@135843

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

providers

docs: fix code snippet errors

2010-10-15 10:40:54 -07:00

resources

resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp

2011-02-07 21:17:09 -08:00

search

Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide

2011-02-07 21:03:04 -08:00

security

cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee

2010-12-14 16:11:02 -08:00

sensors

auto import from //depot/cupcake/@135843

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

sip

cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f

2011-02-08 09:35:02 -08:00

testing

Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide

2011-02-07 21:03:04 -08:00

ui

Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide

2011-02-07 21:03:04 -08:00

views

docs: fix several instances of the 'sidebox' class

2010-03-17 12:39:51 -07:00

wireless

cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e

2010-12-14 17:34:00 -08:00

fundamentals.jd

docs: remove and correct parent links for fundamental docs

2011-02-08 14:05:54 -08:00

index.html

auto import from //depot/cupcake/@135843

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