summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* am b8d74fd9: am 8635908d: Merge "Update resources data JSON, sample screensho...Roman Nurik2011-02-071-2/+2
|\
| * Merge "Update resources data JSON, sample screenshot, and SDK makefile for Ho...Roman Nurik2011-02-071-2/+2
| |\
| | * Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb...Roman Nurik2011-02-071-2/+2
* | | am 236e9db9: am 62e97010: enable javadoc filtering for api level 11 and disab...Scott Main2011-02-071-3/+3
|\ \ \ | |/ /
| * | enable javadoc filtering for api level 11 and disable preview doc modeScott Main2011-02-071-3/+3
| |/
| * Merge ba3dd323 from gingerbreadJean-Baptiste Queru2011-01-291-0/+1
| |\
* | \ am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plu...Scott Main2011-01-261-0/+1
|\ \ \
| * \ \ resolved conflicts for merge of 77ba255e to honeycomb-plus-aospScott Main2011-01-261-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * enable preview mode for docs and add api level 10 flag for api level diffsScott Main2011-01-261-1/+6
* | | New APIs for USB host support:Mike Lockwood2011-01-221-0/+1
|/ /
* | Doc change: adding missing samplesRobert Ly2011-01-191-4/+6
* | Added Honeycomb-Gallery to docs.Alexander Lucas2011-01-191-0/+2
* | Refactoring app widgets to address security/performance issues.Winson Chung2011-01-181-0/+1
* | set sdk version to "Android 3.0" and api level to "Honeycomb"Scott Main2011-01-171-4/+3
* | Import libcore_to_document definition from libcore/Docs.mkBrian Carlstrom2011-01-051-11/+2
* | resolved conflicts for merge of 28e8c66d to masterNick Pelly2010-12-061-2/+1
|\ \ | |/
| * Merge branch gingerbread-nfc into gingerbread.Nick Pelly2010-12-051-2/+1
| |\
| | * Secure Element access implementationDaniel Tomas2010-11-191-0/+1
| | * Rough first pass at the NFC technology API.Jeff Hamilton2010-11-191-2/+0
* | | am f4c2eaf2: am 47ccfcb0: Doc change: add AccelerometerPlay to the generated ...Dirk Dougherty2010-11-291-0/+2
|\ \ \ | |/ /
| * | Doc change: add AccelerometerPlay to the generated samples.Dirk Dougherty2010-11-291-0/+2
* | | am cb1af77f: am b1150edc: Remove HeavyWeight sample from generated html samples.Dirk Dougherty2010-11-291-2/+0
|\ \ \ | |/ /
| * | Remove HeavyWeight sample from generated html samples.Dirk Dougherty2010-11-291-2/+0
* | | docs: add preview sdk docs to provide an api overview and install steps,Scott Main2010-11-291-6/+3
* | | am d3f19b86: am 210e9c4a: Merge "Revert "Disabling AccessibilityService sampl...Trevor Johns2010-11-241-0/+2
|\ \ \ | |/ /
| * | Revert "Disabling AccessibilityService sample from build system."Trevor Johns2010-11-241-0/+2
* | | am 4f3c40cc: am 8fac7c2e: change sdk version variable to 2.3 (for docs)Scott Main2010-11-221-1/+1
|\ \ \ | |/ /
| * | change sdk version variable to 2.3 (for docs)Scott Main2010-11-221-1/+1
| * | Fixing build (DO NOT MERGE)Megha Joshi2010-11-121-1/+1
| * | Adding NFC sample resources (DO NOT MERGE)Megha Joshi2010-11-121-0/+2
| |/
* | resolved conflicts for merge of f0452c25 to masterJason Chen2010-11-041-0/+2
|\ \ | |/
| * Added SIP DemoAlexander Lucas2010-11-031-0/+2
| * add api level 9 'since' flag to docsScott Main2010-10-181-1/+2
| * Fix build.Nick Pelly2010-10-121-0/+8
| * NFC API revision round 2.Nick Pelly2010-10-121-8/+4
* | Add missing NOTICE entries.David Deephanphongs2010-10-191-0/+4
* | add api level 9 'since' flag to docsScott Main2010-10-191-0/+1
* | NFC API revision round 2.Nick Pelly2010-10-141-8/+12
* | Remove the unused UrlRendererServiceBjorn Bringert2010-10-121-2/+0
* | resolved conflicts for merge of f4c3b7e9 to masterNick Pelly2010-09-291-0/+8
|\ \ | |/
| * NFC integrationNick Pelly2010-09-281-0/+8
* | resolved conflicts for merge of d78f338e to masterJesse Wilson2010-09-161-0/+1
|\ \ | |/
| * Add optional tags to frameworks/base ext.Jesse Wilson2010-09-161-1/+1
| * DO NOT MERGE - Doclava warnings are now errors.Joe Onorato2010-09-161-2/+2
* | Make javadoc warnings into errors.Joe Onorato2010-09-161-2/+1
* | am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." ...Dirk Dougherty2010-09-161-15/+2
|\ \ | |/
| * Doc change: clean up droiddoc (cs) macros.Dirk Dougherty2010-09-161-15/+2
| * DO NOT MERGE. Use the new -knowntags option to suppress warnings for some kno...Joe Onorato2010-09-161-1/+10
* | DO NOT MERGE. Use the new -knowntags option to suppress warnings for some kno...Joe Onorato2010-09-161-1/+10
* | am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum ...Dirk Dougherty2010-09-151-2/+2
|\ \ | |/
generated by cgit v1.1 at 2024-10-30 10:58:40 +0000