summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-07Merge "Upgrade Doclava gradle version" am: 34876a477c am: 9bfcb851c9 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000androidx-wear-platform-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseAurimas Liutikas
b8a330e005 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2011197 Change-Id: Id27846d6f2bcd3ed74178d22702061bb47956144
2022-03-07Merge "Upgrade Doclava gradle version" am: 34876a477c am: 9bfcb851c9Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2011197 Change-Id: Ic9861c8c87d7961a19da5934ecaab1ca7d0b3cf5
2022-03-07Merge "Upgrade Doclava gradle version" am: 34876a477candroidx-wear-compose-releaseandroidx-profileinstaller-releaseandroidx-customview-customview-poolingcontainer-releaseAurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2011197 Change-Id: Icead8cc4c36700e9469c452d23890212998e9b6e
2022-03-07Merge "Upgrade Doclava gradle version"Aurimas Liutikas
2022-03-07Upgrade Doclava gradle versionAurimas Liutikas
This stops Android Studio from complaining about the old version used in a project. It is actually a no-op because main project's Gradle version is used anyway. Test: None Change-Id: I9176fa7c08f752386c312227ee2cb30a4519047c
2022-03-04Merge "Move comment to license_note" am: c4bba9390f am: 8cd36ab6f3 am: ↵Treehugger Robot
b3b97be017 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2008358 Change-Id: I31426dee822724228579dee4827169f239e1ac1c
2022-03-04Merge "Move comment to license_note" am: c4bba9390f am: 8cd36ab6f3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2008358 Change-Id: I6b5d9c30e6903cbce08cdd8ceddbf15db3818c44
2022-03-04Merge "Move comment to license_note" am: c4bba9390fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2008358 Change-Id: I7a5d9c86b11acc8aa897c6b2805db0aa82e5f1df
2022-03-04Merge "Move comment to license_note"Treehugger Robot
2022-03-03Move comment to license_noteBob Badour
Comments not preserved during refresh. Test: m nothing Change-Id: I28695a9187449655681302035286a2899f731330
2021-11-18Merge "Upgrade doclava to use gradle 7.3" am: a77d142ee0 am: aeeec1d053 am: ↵Treehugger Robot
7f8518bcdf am: c9c487d402 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1896970 Change-Id: I3d8c6c88d4155150cea04d403d74909ce5bf4b5e
2021-11-18Merge "Upgrade doclava to use gradle 7.3" am: a77d142ee0 am: aeeec1d053 am: ↵Treehugger Robot
7f8518bcdf Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1896970 Change-Id: I86f756f571c6ed3837f6b65b43aec22e8a62960b
2021-11-18Merge "Upgrade doclava to use gradle 7.3" am: a77d142ee0 am: aeeec1d053Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1896970 Change-Id: I36e94307287a6541ed15ce16ed015d1c1090653b
2021-11-18Merge "Upgrade doclava to use gradle 7.3" am: a77d142ee0android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1androidx-metrics-releaseandroid-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1896970 Change-Id: I43163f256f2b5f1426de377adcf4dcb69f23263e
2021-11-18Merge "Upgrade doclava to use gradle 7.3"androidx-compose-material3-releaseTreehugger Robot
2021-11-18Upgrade doclava to use gradle 7.3Owen Gray
We removed the prebuilt for 6.5.1 a while ago. We don't expect to build this ever again, but apparently this can throw error messages. Test: doclava compiles Change-Id: I0035b5f6298fb18f1fb7311848a47181dee079dc
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 4b95116a89 -s ours am: ↵Xin Li
7fb9539e2d -s ours am: c76ccebfed -s ours am: ac7a67a456 -s ours am: 9c6f5b4693 -s ours am skip reason: Merged-In I91645ac90b6665bcbd9b2169eda92a067e83add3 with SHA-1 8e24c2413b is already in history Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1847349 Change-Id: I629f83ecd8cc652dade1c3b9f8e790ff9b539555
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 4b95116a89 -s ours am: ↵Xin Li
7fb9539e2d -s ours am: c76ccebfed -s ours am: ac7a67a456 -s ours am skip reason: Merged-In I91645ac90b6665bcbd9b2169eda92a067e83add3 with SHA-1 8e24c2413b is already in history Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1847349 Change-Id: I7e60dcc7f25c76735a477709b09e52fd43197482
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 4b95116a89 -s ours am: ↵Xin Li
7fb9539e2d -s ours am: c76ccebfed -s ours am skip reason: Merged-In I91645ac90b6665bcbd9b2169eda92a067e83add3 with SHA-1 8e24c2413b is already in history Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1847349 Change-Id: I90809f0eefd3ee9c739004a2ea21ae7a4141d751
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 4b95116a89 -s ours am: ↵Xin Li
7fb9539e2d -s ours am skip reason: Merged-In I91645ac90b6665bcbd9b2169eda92a067e83add3 with SHA-1 8e24c2413b is already in history Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1847349 Change-Id: Ic1d76a60b63bf8d7dbdaa0d21091a9abc699cc40
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 4b95116a89 -s oursXin Li
am skip reason: Merged-In I91645ac90b6665bcbd9b2169eda92a067e83add3 with SHA-1 8e24c2413b is already in history Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1847349 Change-Id: Id1100e9efda8040d70cf7b4a88ed050ae8b36cdd
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2androidx-window-releaseandroid-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I91645ac90b6665bcbd9b2169eda92a067e83add3 Change-Id: I3eff9c44a295a6c6af2ee6a9215cf6db64c74e2c
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
8e24c2413b -s ours am: 418550fe1d -s ours am: 38b0089bde -s ours am: b9151080e2 -s ours am skip reason: Merged-In I0d07b4841f610dfa4b12de9523277f8b9ab27e9f with SHA-1 fc2c1ce1bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/doclava/+/15567577 Change-Id: I1b70e9c8b818d7f8ac8fb95687bf65841786b10a
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
8e24c2413b -s ours am: 418550fe1d -s ours am: 38b0089bde -s ours am skip reason: Merged-In I0d07b4841f610dfa4b12de9523277f8b9ab27e9f with SHA-1 fc2c1ce1bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/doclava/+/15567577 Change-Id: I9195fcca07cce8a3b2abbec575a32507d877a1ef
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
8e24c2413b -s ours am: 418550fe1d -s ours am skip reason: Merged-In I0d07b4841f610dfa4b12de9523277f8b9ab27e9f with SHA-1 fc2c1ce1bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/doclava/+/15567577 Change-Id: I82d774dc82c1314158dfe051c21586f01f1c2772
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
8e24c2413b -s ours am skip reason: Merged-In I0d07b4841f610dfa4b12de9523277f8b9ab27e9f with SHA-1 fc2c1ce1bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/doclava/+/15567577 Change-Id: Ie7c6e214a1c5ebdc4f97c3777e4901487159294f
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I0d07b4841f610dfa4b12de9523277f8b9ab27e9f Change-Id: I91645ac90b6665bcbd9b2169eda92a067e83add3
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ia2049444e6f47726eadd71850dca5c08ef915a24
2021-05-16Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec am: ed699579df am: 1f677215d8 am: fc2c1ce1bc am: 8a2013cdab Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I8d90bdafa429d37f62e1cdcb220d5e087ca30c8d
2021-05-16Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec am: ed699579df am: 1f677215d8 am: 61ace8e0bf am: 2da02a200b Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I926db5292a9fc348a191b5e6c76884a635e2536c
2021-05-15Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec am: ed699579df am: 1f677215d8 am: fc2c1ce1bc Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I06a181d9ee8f9fa524d06b506a5224da0dcf5711
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec am: ed699579df am: 1f677215d8 am: 61ace8e0bf Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I8a1f5533eb0769d4e6ee79a94c8a18715f9f4ba2
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec am: ed699579df am: 1f677215d8 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I129f8ba7d7f16acb73c82c66705db67a0e4fb21d
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec am: ed699579df am: 1f677215d8 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: If3dbd24ed378fb06b3ec06c87524c849f5747c6f
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releasesaff
am: 01990004ec am: ed699579df am: 1f677215d8 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I85c97f90f9ec95798640a9ae8deb39cdf4f45470
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec am: ed699579df am: 1f677215d8 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I0d07b4841f610dfa4b12de9523277f8b9ab27e9f
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devsaff
am: 01990004ec am: ed699579df Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I1e9f0af8a47f28b23843d536a2d7b5cc7461eb68
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I346feb746e72417c3d26b984591929397867516a
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466android-s-beta-5android-s-beta-4android-s-beta-3androidx-wear-wear-remote-interactions-releaseandroidx-wear-wear-phone-interactions-releaseandroidx-wear-wear-ongoing-releaseandroidx-resourceinspection-releaseandroid-s-beta-5android-s-beta-4saff
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: Ia16622160843577edee93774ce02462ef4763777
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive."android-s-beta-2android-s-beta-1saff
2021-05-12Make JAVA_TOOLS_JAR error a little more descriptive.saff
Change-Id: I88e7d0453dcbf2066e5504b5c8a5281c2df17075 Test: N/A
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8e8dae73d8 -s ↵Xin Li
ours am: 901ed21765 -s ours am: 731b93b4b1 -s ours am skip reason: Change-Id I801754ae658bb983d9b51765b6b8193e7211ac35 with SHA-1 3be7c3017a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iceca96a38c75d35bdf16284952cbc9f317d5ae15
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8e8dae73d8 -s ↵Xin Li
ours am: 901ed21765 -s ours am: 731b93b4b1 -s ours am skip reason: Change-Id I801754ae658bb983d9b51765b6b8193e7211ac35 with SHA-1 3be7c3017a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I241e0035bd4ea790a301674f882f14aaafb986e1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8e8dae73d8 -s ↵Xin Li
ours am: 901ed21765 -s ours am skip reason: Change-Id I801754ae658bb983d9b51765b6b8193e7211ac35 with SHA-1 3be7c3017a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc7d834f0354dea42692a579a0de8b8f8d3ea1fe
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8e8dae73d8 -s oursXin Li
am skip reason: Change-Id I801754ae658bb983d9b51765b6b8193e7211ac35 with SHA-1 3be7c3017a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8add392a4e693f30b02295c173247f1ca1bb7981
2021-02-20Mark ab/7061308 as merged in stage.androidx-leanback-releaseXin Li
Bug: 180401296 Merged-In: I801754ae658bb983d9b51765b6b8193e7211ac35 Change-Id: I3090a97b0e7d2d705908cd42b0e888b1a8533259
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/doclava" am: c6a2f85b20 am: ↵Bob Badour
7e3641a9cf am: ea5f6c5152 am: 220cc31253 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1588875 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie56e154c5eb95f365ce9e8335942e42afec4b9b1
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/doclava" am: c6a2f85b20 am: ↵Bob Badour
7e3641a9cf am: ea5f6c5152 am: 220cc31253 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1588875 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I53dc85c7416e8760d37f41d8061abf0b70ca734e
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/doclava" am: c6a2f85b20 am: ↵Bob Badour
7e3641a9cf am: ea5f6c5152 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1588875 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie3d0299595b61c0eea57d1bcdf47ea84624ccd28
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 22:37:04 +0000