aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-28Snap for 11149604 from 77665b03848c6574ff3e40ec875c347d5eb41a8f to ↵androidx-versionedparcelable-releaseAndroid Build Coastguard Worker
androidx-versionedparcelable-release Change-Id: Ia11dc58bb589d4d20dd8983fae63265d878b9752
2023-07-20Remove -language-version flags from dokka am: 7b150bbe96androidx-wear-wear-tooling-preview-releaseandroidx-core-performance-releaseandroidx-compose-g3-releaseColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/2666058 Change-Id: Iaa4f849961a3772426406a4f0b21314176d3f29f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Remove -language-version flags from dokkaandroidx-platform-releaseColin Cross
-language-version 1.3 is no longer supported by kotlinc 1.9.0. Remove the flags and fix a compile error. Bug: 291335478 Test: dokka -J--add-opens=java.base/java.lang=ALL-UNNAMED Change-Id: I7e25b3b68cd75be802a3d92034f22e24cf800396
2022-12-06Add support for "Added in <SDK-ext> <version>" am: eed6dd8800 am: b3269255ad ↵studio-2023.1.1-canary3studio-2023.1.1-canary11android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devMårten Kongstad
am: cc64ac5519 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/2327957 Change-Id: I830c100a79d1100b53ea62ab200b1574244c837f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Add support for "Added in <SDK-ext> <version>" am: eed6dd8800 am: b3269255adandroid-u-beta-1-gplandroidx-window-extensions-core-releaseandroidx-wear-platform-releaseandroidx-privacysandbox-ads-releaseandroidx-health-releaseandroidx-core-remoteviews-releaseandroidx-core-animation-releaseMårten Kongstad
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/2327957 Change-Id: I56a4e48c2b9f177e631789e67be92e81a996d149 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Add support for "Added in <SDK-ext> <version>" am: eed6dd8800main-16k-with-phonesMårten Kongstad
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/2327957 Change-Id: Iccdee94946496b3e285e1f626b1967b30c760905 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Add support for "Added in <SDK-ext> <version>"Mårten Kongstad
Teach Dokka to parse @sdkExtSince javadoc comments. These comments are equivalent to @apiSince, but for SDK extensions. Because symbols can be finalized in an Android dessert (@apiSince), an SDK extensions (@sdkExtSince) or both (@apiSince + @sdkExtSince), Dokka will emit one of the following snippets: - Added in API level <int> - Added in <SDK-extension> <int> - Added in API level <int> Also in <SDK-extension> <int> Bug: 261168446 Test: m ds-docs-kt # and manually inspect out/target/common/docs/ds-docs-kt-docs.zip Change-Id: Ia207d1284cda84ae612a955edfc67aecc75ac462
2021-05-27Merge sc-mainline-prod to master.t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000studio-2022.2.1-canary7studio-2022.2.1-canary2studio-2022.1.1-canary2studio-2022.1.1-canarystudio-2022.1.1-beta4studio-2022.1.1-beta2studio-2021.3.1-betastudio-2021.3.1studio-2021.2.1-patch2studio-2021.2.1-patch1studio-2021.2.1android-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_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000studio-canarystudio-betastudio-2022.1.1-canarymain-16kandroid13-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-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Bill Rassieur
Change-Id: I750d67e40c814e1111f7bf4e7cc149b544a9248b
2021-05-19Revert^2 "Make dokka compile with Kotlin 1.5" am: c80f2ad658 am: 01801820c5 ↵Aurimas Liutikas
am: ffae98f001 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1709769 Change-Id: I4705905f07ef644c98d28e9764ce5d440823219c
2021-05-19Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35 am: 1659fc3898 ↵Aurimas Liutikas
am: cf04b58f72 am: 5c9765afee am: 4467a3a1ca Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: I269b6c891b394532031f4a4c8e5b32712c7a16ee
2021-05-19Make dokka compile with Kotlin 1.5 am: e685f310ce am: fe9ab38dd7 am: ↵Aurimas Liutikas
4c12e38eb0 am: cb1f6577d5 am: f69ee04871 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: I22a0ec16f55bdc540b415d6f44d57ebce823abb1
2021-05-18Revert^2 "Make dokka compile with Kotlin 1.5" am: c80f2ad658 am: 01801820c5android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1androidx-resourceinspection-releaseandroidx-metrics-releaseandroidx-draganddrop-releaseandroidx-customview-customview-poolingcontainer-releaseandroidx-core-core-splashscreen-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1709769 Change-Id: Ia886e189ddd4ecdfb08ccb001745e0c7305988c0
2021-05-18Revert^2 "Make dokka compile with Kotlin 1.5" am: c80f2ad658android-s-beta-5android-s-beta-4android-s-beta-3androidx-wear-wear-remote-interactions-releaseandroidx-wear-wear-phone-interactions-releaseandroidx-wear-wear-ongoing-releaseandroid-s-beta-5android-s-beta-4Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1709769 Change-Id: I9d3bf727f402d873c036fcd300cd7fb1329da3d4
2021-05-18Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35 am: 1659fc3898 ↵Aurimas Liutikas
am: cf04b58f72 am: 5c9765afee am: 505e787fbd am: 8c210b7a39 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: I73a5d6bd51afa839cd20319dc0313f9540707f50
2021-05-18Make dokka compile with Kotlin 1.5 am: e685f310ce am: fe9ab38dd7 am: ↵Aurimas Liutikas
4c12e38eb0 am: cb1f6577d5 am: 2e06d539d7 am: c221a52bb5 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: Ie40369f605ac0cedd18875c8917792eb590a37a6
2021-05-17Revert^2 "Make dokka compile with Kotlin 1.5"Aurimas Liutikas
2d1d7e3f3541bf2610ae9bc0658641c9b4aff0c9 Change-Id: Ib0afe990405c68f5251dce9fc7ce58db902897a5
2021-05-15Annotate two properties in DokkaTask am: 1ba19b6c05 am: 2d9cf30691 am: ↵Aurimas Liutikas
413a49dd20 am: affbec5337 am: 4ea75c1fca Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1682145 Change-Id: I6077ce3aad7d50f65edc0446b6c6cb4ea5cce613
2021-05-12Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35 am: 1659fc3898 ↵Aurimas Liutikas
am: cf04b58f72 am: 5c9765afee am: 505e787fbd Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: If36d6dd9cb47138827e10e1c8473bc794cb8b262
2021-05-12Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35 am: 1659fc3898 ↵Aurimas Liutikas
am: cf04b58f72 am: 5c9765afee Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: I7f518df08bdf7793775233d64d3dd793b9579ab3
2021-05-12Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35 am: 1659fc3898 ↵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-releaseAurimas Liutikas
am: cf04b58f72 am: 5c9765afee Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: I5480906113158dab86752d043fad0e2fd9365392
2021-05-12Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35 am: 1659fc3898 ↵Aurimas Liutikas
am: cf04b58f72 am: 5c9765afee Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: Ia68ef299415ddc9affec6d350ec73ef58f582b7a
2021-05-12Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35 am: 1659fc3898 ↵Aurimas Liutikas
am: cf04b58f72 am: 5c9765afee Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: Ie2baef55c980672cb039fe14e66009dd566b94ce
2021-05-12Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35 am: 1659fc3898 ↵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-devAurimas Liutikas
am: cf04b58f72 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: Ibd256e476510f734eb5fd78788e3fa716f619955
2021-05-12Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35 am: 1659fc3898Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: Idbe030c865ce1f3170c8c4707a91d8bd05eee984
2021-05-12Revert "Make dokka compile with Kotlin 1.5" am: 2d1d7e3f35Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1705628 Change-Id: I771e30cc269b597d9f476d5d70704afd82393bd8
2021-05-12Revert "Make dokka compile with Kotlin 1.5"android-s-beta-2android-s-beta-1Aurimas Liutikas
This reverts commit e685f310ce1f492132cc49e5074c9a0779f57b53. Reason for revert: b/187908823 Change-Id: I0e5af68fcd8aa687b8a289503f2edf310b567af2
2021-05-11Make dokka compile with Kotlin 1.5 am: e685f310ce am: fe9ab38dd7 am: ↵Aurimas Liutikas
4c12e38eb0 am: cb1f6577d5 am: 2e06d539d7 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: I30ff1881358144235ca093df60401e80057b6d4b
2021-05-11Make dokka compile with Kotlin 1.5 am: e685f310ce am: fe9ab38dd7 am: ↵Aurimas Liutikas
4c12e38eb0 am: cb1f6577d5 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: I81797202e9c7deb6098c4c547e00aa82ea5cdee3
2021-05-11Make dokka compile with Kotlin 1.5 am: e685f310ce am: fe9ab38dd7 am: ↵Aurimas Liutikas
4c12e38eb0 am: cb1f6577d5 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: Ia03db634e062f38a4b31a034f2c859778bc7af62
2021-05-11Make dokka compile with Kotlin 1.5 am: e685f310ce am: fe9ab38dd7 am: ↵Aurimas Liutikas
4c12e38eb0 am: cb1f6577d5 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: Id2b3211cc23e3efcbb3b057916c32edc621f5e1a
2021-05-11Make dokka compile with Kotlin 1.5 am: e685f310ce am: fe9ab38dd7 am: ↵Aurimas Liutikas
4c12e38eb0 am: cb1f6577d5 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: I4438c7db210edcd0fe0e10d986db10f5e54c0d50
2021-05-11Make dokka compile with Kotlin 1.5 am: e685f310ce am: fe9ab38dd7 am: 4c12e38eb0Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: I304152b68c7c9ccdc13252c271d88f2d3b74d84c
2021-05-11Make dokka compile with Kotlin 1.5 am: e685f310ce am: fe9ab38dd7Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: Ibd4fb5ec7cffc2d38afb3387a607f5bd762f51f3
2021-05-11Make dokka compile with Kotlin 1.5 am: e685f310ceAurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1701900 Change-Id: Idb52958c6cb30641a09f368e1a42f0f4e791a883
2021-05-10Make dokka compile with Kotlin 1.5Aurimas Liutikas
Update a number of implicit receivers to explicit ones. Test: make dokka -> now passes Change-Id: Ie5778923137694ca0c896de1717e75b95d9d710a
2021-04-21Annotate two properties in DokkaTask am: 1ba19b6c05 am: 2d9cf30691 am: ↵Aurimas Liutikas
413a49dd20 am: affbec5337 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1682145 Change-Id: If956ef07d79b4cb3143e98b9ca4a4ddf3b0871ec
2021-04-21Annotate two properties in DokkaTask am: 1ba19b6c05 am: 2d9cf30691 am: ↵Aurimas Liutikas
413a49dd20 am: affbec5337 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1682145 Change-Id: I12b64b4748339d2a5407b18ab4d735de3992ccff
2021-04-21Annotate two properties in DokkaTask am: 1ba19b6c05 am: 2d9cf30691 am: ↵Aurimas Liutikas
413a49dd20 am: affbec5337 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1682145 Change-Id: I790636badf4de4f84382f849d139d5479589d32d
2021-04-21Annotate two properties in DokkaTask am: 1ba19b6c05 am: 2d9cf30691 am: ↵Aurimas Liutikas
413a49dd20 Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1682145 Change-Id: I36f2a6764e0bb970a5346c8476a802ad7b7840c4
2021-04-21Annotate two properties in DokkaTask am: 1ba19b6c05 am: 2d9cf30691Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1682145 Change-Id: If7e4a96e483b7885e93825c5fd40616015ea4650
2021-04-21Annotate two properties in DokkaTask am: 1ba19b6c05Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1682145 Change-Id: Iaada186b9df26cab64647b9fc67f3b997a38e00b
2021-04-20Annotate two properties in DokkaTaskAurimas Liutikas
DokkaTask#outputDirectory as internal DokkaTask#reportNotDocumented as input Gradle 7.0 requires explict marking of all properties. Test: None Change-Id: I00e13eff666a965dc31b70ac31eb506522836b56
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 27627c3763 -s ↵Xin Li
ours am: 68469f14a7 -s ours am: 84efc9b326 -s ours am skip reason: Change-Id Ibd8831e2bbd9eab4a9119ac9a18cf47312c372bf with SHA-1 46ba308559 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa2074ebdb07a2da124f899e257edfc8c3a23757
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 27627c3763 -s ↵Xin Li
ours am: 68469f14a7 -s ours am: 84efc9b326 -s ours am skip reason: Change-Id Ibd8831e2bbd9eab4a9119ac9a18cf47312c372bf with SHA-1 46ba308559 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0c022d3116ebba3f0870201a413825608b67279b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 27627c3763 -s ↵Xin Li
ours am: 68469f14a7 -s ours am skip reason: Change-Id Ibd8831e2bbd9eab4a9119ac9a18cf47312c372bf with SHA-1 46ba308559 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0f725b9a9e78d87fb0a1fec29bb533bed75d2240
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 27627c3763 -s oursXin Li
am skip reason: Change-Id Ibd8831e2bbd9eab4a9119ac9a18cf47312c372bf with SHA-1 46ba308559 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib943f5e559975ea228d985c2fa21275bb5a19ad3
2021-02-20Mark ab/7061308 as merged in stage.androidx-leanback-releaseXin Li
Bug: 180401296 Merged-In: Ibd8831e2bbd9eab4a9119ac9a18cf47312c372bf Change-Id: Ic1f6eb9cd9b82d71f3b8dcd04dd7689d5a3b0832
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dokka am: 1e42b16f02 am: ↵Bob Badour
ab4c112a23 am: 58853f7a1e am: 12e0c4701a Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1587908 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iee56b87683f31cdcd128b6567958520035ef150a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dokka am: 1e42b16f02 am: ↵Bob Badour
ab4c112a23 am: 58853f7a1e am: 12e0c4701a Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1587908 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I938f2abc3ebc367e68b34c5de9eb0bd1db669e78
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dokka am: 1e42b16f02 am: ↵Bob Badour
ab4c112a23 am: 58853f7a1e Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1587908 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iac6b3ef98271a0b7297014beb468d9d22d4bc023
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 13:22:11 +0000