summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gingerbread' of git://android.git.kernel.org/platform/framework...Steve Kondik2011-04-303-51/+64
|\
| * Fixing line in Market IAB docs that explains how to bind to theTrevor Johns2011-03-301-1/+1
| * Minor doc update.Nick Pelly2011-02-161-49/+62
| * fix md5sum for windows installerScott Main2011-02-141-1/+1
* | Merge branch 'gingerbread' of git://android.git.kernel.org/platform/framework...Steve Kondik2011-02-28461-7334/+78352
|\ \ | |/
| * Doc change: nfc dev guideRobert Ly2011-02-102-0/+603
| * add 2.3.3 announcement to site home pageScott Main2011-02-091-10/+9
| * Doc change: Add version notes for Android 2.3.3.Dirk Dougherty2011-02-084-1/+438
| * rename SIP doc titleScott Main2011-02-081-1/+1
| * docs: move the SIP guide into guide/network/Scott Main2011-02-072-1/+1
| * cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2Katie McCormick2011-02-072-0/+494
| * Merge "Doc change: Add diff report for api 10." into gingerbreadDirk Dougherty2011-02-0747-0/+5553
| |\
| | * Doc change: Add diff report for api 10.Dirk Dougherty2011-02-0247-0/+5553
| * | cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91Scott Main2011-02-031-9/+9
| * | fix broken links, update the dev guide intro, and update sitemap fileScott Main2011-02-025-4225/+4263
| |/
| * Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread in...Scott Main2011-02-028-41/+103
| |\
| | * wholesale manual merge of docs from gingerbread-docs to gingerbreadScott Main2011-02-028-41/+103
| * | cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2Scott Main2011-02-021-14/+34
| |/
| * cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83Bill Gruber2011-02-0219-6/+1774
| * cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821Scott Main2011-02-021-0/+5
| * cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680Scott Main2011-02-021-1/+1
| * Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbreadDirk Dougherty2011-01-281-1/+1
| |\
| | * Doc change: Add time-lapse video to 3.0 highlights.Dirk Dougherty2011-01-271-1/+1
| * | cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6dScott Main2011-01-271-2/+4
| * | Doc change: fix adt archive filename.Dirk Dougherty2011-01-271-1/+1
| |/
| * catchup the gingerbread branch to gingerbread-docs for all sdk docsScott Main2011-01-2627-168/+910
| * docs: catchup gingerbread to gingerbread-docs with misc changesScott Main2011-01-0712-48/+78
| * cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235fScott Main2011-01-071-19/+12
| * fix bug 3295540Scott Main2011-01-071-1/+1
| * Documentation fixes found over vacation hacking.Brad Fitzpatrick2011-01-053-3/+3
| * cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954Scott Main2010-12-201-4/+3
| * cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308cScott Main2010-12-161-7/+7
| * cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5Scott Main2010-12-165-9/+12
| * cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4Scott Main2010-12-153-8/+18
| * modifications to webinars:Scott Main2010-12-153-7/+42
| * cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abdScott Main2010-12-151-8/+9
| * cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55eeScott Main2010-12-151-4/+4
| * cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433eScott Main2010-12-146-136/+51
| * cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1Scott Main2010-12-142-154/+10
| * cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180eScott Main2010-12-1421-45/+40
| * cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591aScott Main2010-12-141-6/+3
| * cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72Scott Main2010-12-144-3031/+4065
| * cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebdScott Main2010-12-142-3/+3
| * cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708Scott Main2010-12-142-5/+5
| * cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495dfScott Main2010-12-1418-22/+29
| * cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63Scott Main2010-12-143-5/+7
| * cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55eeScott Main2010-12-1412-29/+14
| * Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon te...Roman Nurik2010-12-1336-2633/+2191
| |\
| | * Update icon guidelines for Gingerbread. Also add new, revamped icon templates...Roman Nurik2010-12-1336-2633/+2191
| * | Merge "Integrating webinar hosting with developer.android.com" into gingerbreadMegha Joshi2010-12-105-2/+275
| |\ \