summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.Dirk Dougherty2010-09-141-2/+2
| |\
| | * Doc change: update ADT 0.9.8 checksum and size.Dirk Dougherty2010-09-141-2/+2
| * | Make @deprecated without a comment an error DO NOT MERGEJoe Onorato2010-09-101-1/+1
* | | Make @deprecated without comment an error.Joe Onorato2010-09-101-0/+1
* | | am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK T...Dirk Dougherty2010-09-081-4/+4
|\ \ \ | |/ /
| * | am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." in...Dirk Dougherty2010-09-081-4/+4
| |\ \ | | |/
| | * Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.Dirk Dougherty2010-09-081-4/+4
* | | Update RecentApplications to use shared Carousel widget.Jim Miller2010-09-031-3/+0
* | | Don't try to dist the stubs or comment check docs builds.Joe Onorato2010-09-011-0/+4
* | | am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and public...Joe Onorato2010-08-311-2/+0
|\ \ \ | |/ /
| * | Can't have two rules building the stubs and public.xml!Joe Onorato2010-08-311-2/+0
| * | DO NOT MERGE - Back port change from master that enforces correctness in the ...Joe Onorato2010-08-311-0/+29
* | | Clean up doc build to use Android custom doclava.Dirk Dougherty2010-08-301-8/+3
* | | Add another pass of the docs that nothing depends on that tries to parse some...Joe Onorato2010-08-301-0/+29
* | | Clean up the messJoe Onorato2010-08-271-3/+1
* | | Fix MonkeyRunner SDK documentation generation.Bill Napier2010-08-251-3/+4
* | | Revert "Add support for generated documentation as part of the SDK docs."Mike Lockwood2010-08-251-3/+3
* | | am 22518947: am bfc9325f: Merge "Add support for generated documentation as p...Rohit Mungee2010-08-241-3/+3
|\ \ \ | |/ /
| * | Add support for generated documentation as part of the SDK docs.Bill Napier2010-08-241-3/+3
* | | am 63f05fe4: am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample ...Trevor Johns2010-08-241-2/+0
|\ \ \ | |/ /
| * | am ca9d51b1: Disabling AccessibilityService sample from build system.Trevor Johns2010-08-201-2/+0
| |\ \ | | |/
| | * Disabling AccessibilityService sample from build system.Trevor Johns2010-08-201-2/+0
* | | resolved conflicts for merge of 485de781 to masterKenny Root2010-08-241-4/+0
|\ \ \ | |/ /
| * | Reorganize MountService IPCKenny Root2010-08-201-4/+0
* | | Explicit warning level for deprecation mismatchBen Dodson2010-08-191-1/+1
* | | Fix 2797185: Integrate Carousel widget into framework.Jim Miller2010-08-181-0/+3
* | | am 96e24634: am e6bfceeb: am 3b70e159: Merge "Adding a sample accessibility s...Roman Nurik2010-08-171-0/+2
|\ \ \ | |/ /
| * | am 3b70e159: Merge "Adding a sample accessibility service -make" into froyoRoman Nurik2010-08-171-0/+2
| |\ \ | | |/
| | * Adding a sample accessibility service -makeSvetoslav Ganov2010-08-101-0/+2
* | | am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerSer...Kenny Root2010-08-111-0/+1
|\ \ \ | |/ /