summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in mnc-release history after reset to mnc-devandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-cts-releaseThe Android Automerger2015-08-120-0/+0
|\
| * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-070-0/+0
| |\
| | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-160-0/+0
| | |\
| | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-150-0/+0
| | | |\
* | | | | Display annotations and annotation values when they are requestedandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr-devmarshmallow-devOmari Stephens2015-08-103-3/+63
|/ / / /
* | | | am 30c1443e: am 54004373: Fix handling of double-byte chars for tags, keywords.Dirk Dougherty2015-07-062-15/+13
|\ \ \ \ | |/ / / |/| | |
| * | | am 54004373: Fix handling of double-byte chars for tags, keywords.Dirk Dougherty2015-07-062-15/+13
| |\ \ \
| | * | | Fix handling of double-byte chars for tags, keywords.Dirk Dougherty2015-07-022-15/+13
* | | | | am 9647be42: am 0ec3764e: Fix a bug where \' (apostrophe/single quote) was be...C. Sean Young2015-06-151-1/+1
|\| | | |
| * | | | am 0ec3764e: Fix a bug where \' (apostrophe/single quote) was being escaped w...C. Sean Young2015-06-121-1/+1
| |\ \ \ \
| | * | | | Fix a bug where ' (apostrophe/single quote) was being escaped with &pos inste...C. Sean Young2015-06-121-1/+1
* | | | | | am 7effdf51: am f8e1e391: Minor performance tweak in Doclava#makePackageHDF()C. Sean Young2015-06-151-2/+3
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | am f8e1e391: Minor performance tweak in Doclava#makePackageHDF()C. Sean Young2015-06-121-2/+3
| |\| | |
| | * | | Minor performance tweak in Doclava#makePackageHDF()C. Sean Young2015-06-121-2/+3
* | | | | Merge "Fix NPE on checkapi with malformed text input" into mnc-devJames Cook2015-06-121-15/+10
|\ \ \ \ \
| * | | | | Fix NPE on checkapi with malformed text inputJames Cook2015-06-081-15/+10
| | |_|_|/ | |/| | |
* | | | | resolved conflicts for merge of b4dd76b8 to mnc-devC. Sean Young2015-06-121-2/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 4a42aefb: Update JDK tools jar lookup logic to use BuildUtils.C. Sean Young2015-06-121-12/+3
| |\| |
| | * | Update JDK tools jar lookup logic to use BuildUtils.C. Sean Young2015-06-101-12/+3
* | | | Fix broken handling of @removed tagSvetoslav2015-06-051-1/+2
* | | | am 96c56a80: am 024e9b26: Add distribute/tools content to essentials content.Dirk Dougherty2015-05-261-1/+1
|\| | |
| * | | am 024e9b26: Add distribute/tools content to essentials content.Dirk Dougherty2015-05-261-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Add distribute/tools content to essentials content.Dirk Dougherty2015-05-261-1/+1
* | | | am b9ced2dd: am 4d6512a4: Docs: Enables NDK Downloads page to use sdkpage.cs ...David Friedman2015-05-241-0/+2
|\| | |
| * | | am 4d6512a4: Docs: Enables NDK Downloads page to use sdkpage.cs to construct ...David Friedman2015-05-241-0/+2
| |\| |
| | * | Docs: Enables NDK Downloads page to use sdkpage.cs to construct downloadDavid Friedman2015-05-231-0/+2
* | | | resolved conflicts for merge of c10f7ae0 to mnc-devC. Sean Young2015-05-203-5/+79
|\| | |
| * | | am dc0b6e0d: Merge "Add the ability to specify packages or classes to ignore ...C. Sean Young2015-05-203-6/+62
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Add the ability to specify packages or classes to ignore for ApiCheck....C. Sean Young2015-05-203-6/+62
| | |\ \
| | | * | Add the ability to specify packages or classes to ignore for ApiCheck.C. Sean Young2015-05-203-6/+62
* | | | | resolved conflicts for merge of 552b5f66 to mnc-devC. Sean Young2015-05-203-27/+38
|\| | | |
| * | | | am 6904e036: Merge "Make CheckApi error messages more consisent and informati...C. Sean Young2015-05-203-27/+38
| |\| | |
| | * | | Merge "Make CheckApi error messages more consisent and informative." into lmp...C. Sean Young2015-05-203-27/+38
| | |\ \ \
| | | * | | Make CheckApi error messages more consisent and informative.C. Sean Young2015-05-143-27/+38
| | | |/ /
* | | | | am 6375c329: am da4b2e21: Save memory by re-using empty TagInfo (and subclass...C. Sean Young2015-05-2013-28/+101
|\| | | |
| * | | | am da4b2e21: Save memory by re-using empty TagInfo (and subclasses) arrays.C. Sean Young2015-05-2013-28/+101
| |\| | |
| | * | | Save memory by re-using empty TagInfo (and subclasses) arrays.C. Sean Young2015-05-2013-28/+101
| | |/ /
* | | | Merge "add new option to ApiCheck to look for new API methods" into mnc-devGuang Zhu2015-05-144-3/+167
|\ \ \ \
| * | | | add new option to ApiCheck to look for new API methodsGuang Zhu2015-04-274-3/+167
* | | | | am a97e1bf7: am e8cdc5b7: Set page.type to preview for preview pages.Dirk Dougherty2015-05-071-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am e8cdc5b7: Set page.type to preview for preview pages.Dirk Dougherty2015-05-071-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Set page.type to preview for preview pages.Dirk Dougherty2015-05-061-0/+1
* | | | | am 34cf9d6e: (-s ours) Add wildcard support to stubpackages DO NOT MERGEChris Banes2015-05-040-0/+0
|\| | | |
| * | | | Add wildcard support to stubpackages DO NOT MERGEChris Banes2015-05-041-1/+44
| |/ / /
* | / / Add wildcard support to stubpackagesChris Banes2015-05-011-1/+44
| |/ / |/| |
* | | am b948ffff: am 793d5096: am d1ccc1c9: am 26333cad: add hdf variables for ndk...smain@google.com2015-04-141-1/+5
|\| |
| * | am 793d5096: am d1ccc1c9: am 26333cad: add hdf variables for ndk tab docssmain@google.com2015-04-141-1/+5
| |\ \
| | * | am d1ccc1c9: am 26333cad: add hdf variables for ndk tab docssmain@google.com2015-04-141-1/+5
| | |\|
| | | * am 26333cad: add hdf variables for ndk tab docssmain@google.com2015-04-131-1/+5
| | | |\
| | | | * add hdf variables for ndk tab docsandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releasesmain@google.com2015-04-131-1/+5