summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Docs: Re-adding a top level security section, removed in merge."android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Clay Murphy2016-04-261-4/+4
|\
| * Docs: Re-adding a top level security section, removed in merge.Gina Dimino2016-04-251-4/+4
|/
* Merge remote-tracking branch 'goog/nyc-dev' into HEADXin Li2016-04-2515-299/+722
|\
| * Merge changes from topic 'merge_docs_nyc-dev' into nyc-devTrevor Johns2016-04-208-267/+654
| |\
| | * Fix errors from merge conflict resolutionTrevor Johns2016-04-191-7/+2
| | * Revert "Revert "Resolve merge conflicts of 91f2a6a to nyc-dev""Trevor Johns2016-04-198-264/+656
| * | Revert "Resolve merge conflicts of 91f2a6a to nyc-dev"Trevor Johns2016-04-128-656/+264
| * | Resolve merge conflicts of 91f2a6a to nyc-devTrevor Johns2016-04-118-264/+656
| |\ \ | | |/ | |/|
| | * Merge branch 'mnc-mr-docs' into mnc-ub-devTrevor Johns2016-04-059-287/+687
| | |\
| | | * Add doclava flag 'referenceonly' to skip generating the HTML files.smain@google.com2016-03-072-17/+29
| | | * Support a preview page type in legacy templates.Dirk Dougherty2016-03-031-1/+1
| | | * Fix cards display for preview pages by assigning to type 'about'.Dirk Dougherty2016-03-031-1/+1
| | | * Add preview when -includePreview is passed to doclava.Dirk Dougherty2016-03-011-13/+10
| | | * Add parameter type to method documentation.smain@google.com2016-02-183-74/+80
| | | * put the parameter_list() method back in macros.smain@google.com2016-02-091-0/+9
| | | * Merge "Update macros as needed for rewrite of templates that make them re-usa...Scott Main2016-02-091-88/+130
| | | |\
| | | | * Update macros as needed for rewrite of templatessmain@google.com2016-02-091-88/+130
| | | * | Merge "Include Preview in nav and process /preview files based on build-time ...Dirk Dougherty2016-02-082-6/+18
| | | |\ \ | | | | |/ | | | |/|
| | | | * Include Preview in nav and process /preview files based on build-time flag -i...Dirk Dougherty2016-02-062-6/+18
| | | * | Remove synchronized from docsNeil Fuller2016-02-031-2/+0
| | | |/
| | | * Break out jd lists into lang specific files. Rescope page.type and add page.c...Dirk Dougherty2016-01-295-124/+444
| | | * Add extract page canonical url and pass to templates.Dirk Dougherty2015-10-141-3/+8
| | | * Merge "Docs: Support building In, Vi pages." into mnc-mr-docsDavid Friedman2015-10-061-2/+2
| | | |\
| | | | * Docs: Support building In, Vi pages.David Friedman2015-10-051-2/+2
| | | * | docs: Remove page.type setting for preview pages.Quddus Chong2015-09-141-1/+0
| | | |/
| * | | add HDF variable for 'referenceonly' based on the -referenceonly command flag.smain@google.com2016-03-221-0/+1
| * | | cherrypick I9edd6eab9ecb7e3b41c444e7e545702e855a5928smain@google.com2016-03-092-18/+30
| * | | Add support for @implSpec and @implNoteNeil Fuller2016-03-022-1/+15
| * | | Add license headers to generated stubs.Narayan Kamath2016-02-122-0/+170
| * | | Merge "Support for @apiNote"Neil Fuller2016-01-290-0/+0
| |\ \ \
| * \ \ \ Merge "Add support to doclava for default / static interface methods"Neil Fuller2016-01-270-0/+0
| |\ \ \ \
| * \ \ \ \ Merge "Support for @apiNote"Neil Fuller2016-01-274-1/+38
| |\ \ \ \ \
| | * | | | | Support for @apiNoteNeil Fuller2016-01-254-1/+38
| * | | | | | Fix wrong string constant that lead service_actions.txt to be emptyAndrew Shulaev2016-01-250-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fix wrong string constant that lead service_actions.txt to be emptyAndrew Shulaev2016-01-251-1/+1
| * | | | | | Merge "Fix wrong string constant that lead service_actions.txt to be empty"Andrew Shulaev2016-01-251-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix wrong string constant that lead service_actions.txt to be emptyAndrew Shulaev2015-12-161-1/+1
| * | | | | | Add support to doclava for default / static interface methodsNeil Fuller2016-01-157-32/+54
| * | | | | | Merge "Remove synchronized from docs"Neil Fuller2016-01-150-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Enable automatic HTML-escaping for @code tags"Neil Fuller2016-01-150-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "Keep track of braces {} in @code comments"Neil Fuller2016-01-150-0/+0
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Make doclava keep parameter annotations in generated stubs.Morad Abdelrahman2015-12-296-8/+30
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge "Remove synchronized from docs"Neil Fuller2015-12-041-2/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove synchronized from docsNeil Fuller2015-11-251-2/+0
| * | | | | | | | | Enable automatic HTML-escaping for @code tagsNeil Fuller2015-12-021-4/+1
| * | | | | | | | | Keep track of braces {} in @code commentsNeil Fuller2015-11-271-2/+8
| |/ / / / / / / /
| * | | | | | | | Merge "Docs: Add Security tab to top" am: ab832815faClay Murphy2015-11-021-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 9132d8a8: am 77cd5e5e: Properly expose methods that override a non-hidden ...C. Sean Young2015-09-241-1/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 9577e3e5: am d7a6af33: (-s ours) am 274a19e4: Display annotations and anno...Omari Stephens2015-08-270-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 359e1f85: am 3f43a5d6: (-s ours) am c5981e1b: Merge "Workaround for breaki...Neil Fuller2015-08-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 14:51:17 +0000