aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-15Update glide dependencies to androidx am: 7d5ffbf62c am: 0aa3436fcd am: ↵HEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-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_341510000mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devTrevor Radcliffe
785f867685 am: 6f8b1fbb07 am: d7e6aacf5e Original change: https://android-review.googlesource.com/c/platform/external/glide/+/2016298 Change-Id: Ifb1d353af63d167ce86a44275a726beb7c3da324
2022-03-15Update glide dependencies to androidx am: 7d5ffbf62c am: 0aa3436fcd am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Trevor Radcliffe
785f867685 am: 6f8b1fbb07 Original change: https://android-review.googlesource.com/c/platform/external/glide/+/2016298 Change-Id: I5b64a9316c2d43e0d37d9daa629ab1c59bd64178
2022-03-15Update glide dependencies to androidx am: 7d5ffbf62c am: 0aa3436fcd am: ↵Trevor Radcliffe
785f867685 am: 6f8b1fbb07 Original change: https://android-review.googlesource.com/c/platform/external/glide/+/2016298 Change-Id: I5c2d3dfc0b6f9246152eb507e495f301007e2e9c
2022-03-15Update glide dependencies to androidx am: 7d5ffbf62c am: 0aa3436fcd am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-u-beta-1-gplandroid-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_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_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000main-16k-with-phonesmain-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-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseTrevor Radcliffe
785f867685 Original change: https://android-review.googlesource.com/c/platform/external/glide/+/2016298 Change-Id: Icea67c4b1e3cde0e13996c65773d405e769d40f5
2022-03-15Update glide dependencies to androidx am: 7d5ffbf62c am: 0aa3436fcdTrevor Radcliffe
Original change: https://android-review.googlesource.com/c/platform/external/glide/+/2016298 Change-Id: Id169b110d6118be4368bfa484f3f9c6fa6bc64dc
2022-03-15Update glide dependencies to androidx am: 7d5ffbf62cTrevor Radcliffe
Original change: https://android-review.googlesource.com/c/platform/external/glide/+/2016298 Change-Id: I7eb6c6689490b404015d14070d21190f17995586
2022-03-08Update glide dependencies to androidxTrevor Radcliffe
Fixes: 223214428 Test: Treehugger Test: Build dependent apps Change-Id: I3cb8cbaecf16d69dfe66b60467175e16e11136f5
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ied28b6b27b28baeae73df7b9e5030b5ec3f37adb
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/glide am: f330d50a00 am: ↵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-releaseBob Badour
c6174e355f am: 1d5ae4321b am: 6c0bbac880 Original change: https://android-review.googlesource.com/c/platform/external/glide/+/1588643 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ied84cbe10223a144b283a62a469abf8724407901
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/glide am: f330d50a00 am: ↵Bob Badour
c6174e355f am: 1d5ae4321b am: 6c0bbac880 Original change: https://android-review.googlesource.com/c/platform/external/glide/+/1588643 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I33fd5e4318d7d04c4154c92eec3fbf7877a1bc1e
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/glide am: f330d50a00 am: ↵android-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-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-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-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-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-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Bob Badour
c6174e355f am: 1d5ae4321b Original change: https://android-review.googlesource.com/c/platform/external/glide/+/1588643 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1e58e7144ebb711cd11fced1c4e10b006208d5f4
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/glide am: f330d50a00 am: c6174e355fBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/glide/+/1588643 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b2017a33d2359273aed9424bd0cf0c3d610b095
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/glide am: f330d50a00android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/glide/+/1588643 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I32cde7490496b6bcdb04f4a6d67de8b765430a0f
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/glideandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT legacy_notice to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I0b94aa1c3f66a1445434c494ee34f3091f1be6ff
2020-04-24Add license type: Apache2+BSD+MIT = NOTICE licenses am: 459fb3d46d am: ↵Bob Badour
305446b544 am: d15e1a3ab5 am: 3fe4c4646d am: b74f9610b0 Change-Id: I9eb4342765164092e3854d08dc7bf36f8e53ea62
2020-04-24Add license type: Apache2+BSD+MIT = NOTICE licenses am: 459fb3d46d am: ↵Bob Badour
305446b544 am: d15e1a3ab5 am: 3fe4c4646d Change-Id: I3a5ed1f0c6373985576d4f7f101205d028c59369
2020-04-24Add license type: Apache2+BSD+MIT = NOTICE licenses am: 459fb3d46d am: ↵Bob Badour
305446b544 am: d15e1a3ab5 Change-Id: Ie5c3c6dc5ba212ce684a2e7b2d0ef24477f26227
2020-04-24Add license type: Apache2+BSD+MIT = NOTICE licenses am: 459fb3d46d am: ↵Bob Badour
305446b544 Change-Id: Ibb0b2966c0c7011b0c4923c0a2e9b334f6ba49df
2020-04-24Add license type: Apache2+BSD+MIT = NOTICE licenses am: 459fb3d46dandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: I3c142707a5af699fcd63c469262eb7e6e330766c
2020-04-23Add license type: Apache2+BSD+MIT = NOTICE licensesBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I7cce8ed84ed9601c487c4bce4423c81fcbf6199b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f29082767a -s ours am: 2886375e6a am: fb0fee7bad am: a9027b99b7 -s ours am skip reason: subject contains skip directive Change-Id: Ib82bd4de5091c946bddbc6322fdde8abee07aa92
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f29082767a -s ours am: 2886375e6a am: fb0fee7bad Change-Id: Ib77e6b0da515ad23247fe1a0628459d1e6932098
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f29082767a -s ours am: 2886375e6a Change-Id: Ie78b44339d6810170b1ae81b99101da153c2765b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f29082767a -s ours am skip reason: subject contains skip directive Change-Id: Ia847ee436d126b7eaa4e41c7633f520c4f6945a4
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: If26509a05ab1127606e48bfdf01adff060593d54
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 27f35f5d6b am: 42927ec13e ↵Bob Badour
am: 61b599cac4 am: b312599d41 am: 51cd96839a Change-Id: I99f2309b2ed44340fc8c3b58c5e7600ec063bd7a
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 27f35f5d6b am: 42927ec13e ↵Bob Badour
am: 61b599cac4 am: b312599d41 Change-Id: I73f010146ba933254d07579ba41e157c4bbabfb0
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 27f35f5d6b am: 42927ec13e ↵Bob Badour
am: 61b599cac4 Change-Id: I9d819b4706a763f2669853e8ca3bd9c6427193c6
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 27f35f5d6b am: 42927ec13eBob Badour
Change-Id: I9115714191d11bbe82988932cf1135ab88ebe1c1
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 27f35f5d6b am: 42927ec13eBob Badour
Change-Id: Id53e8852aee88e14ccaa5a299ef690e772f046a3
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 27f35f5d6bBob Badour
Change-Id: I1e1494b71970628929b34795e77f1756c1b39d1e
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ifca30b072af6f536d1f458bce6df689c82437fd9
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterr_aml_301500702q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-mainline-12.0.0_r55android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r6android-11.0.0_r5android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r4android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android-11.0.0_r1android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-platform-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: a85fe47bc5 -s ours am skip reason: subject contains skip directive Change-Id: Id543aa43701e3a5e2a16922ff08867aa0131aea7
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Iad03f82ff3d93269ba55e95123f975f333e9a60f
2019-01-15Add default code reviewers into OWNERS am: aeba9a5bf3 am: 98ac8698bcChih-Hung Hsieh
am: 53fe92e0bd Change-Id: Ia6ab8f983bc202cb60c8d4a6786330e9c944385c
2019-01-15Add default code reviewers into OWNERS am: aeba9a5bf3Chih-Hung Hsieh
am: 98ac8698bc Change-Id: I710a4ce2c3d9224f8805aac6595ff9735fd02311
2019-01-15Add default code reviewers into OWNERSChih-Hung Hsieh
am: aeba9a5bf3 Change-Id: I4d3a6126dc818e1776e566845aaa1bdbe64b427d
2019-01-15Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I3abb630858d394a9891bfb5f576a40ad597a49ef
2019-01-15Merge "Convert Android.mk to Android.bp." am: b0b6ab038c am: c68c18b32aSasha Smundak
am: bf7df9e445 Change-Id: I4395d76649185c5561ee5fa74f49028c7e6f9ae4
2019-01-15Merge "Convert Android.mk to Android.bp." am: b0b6ab038cSasha Smundak
am: c68c18b32a Change-Id: I4061689715a4f54846655080e52b70c3d2e0c0c9
2019-01-15Merge "Convert Android.mk to Android.bp."Sasha Smundak
am: b0b6ab038c Change-Id: I1138e1742cf7c95edce9f5bb4bdb2ce3ba977d07
2019-01-15Merge "Convert Android.mk to Android.bp."Treehugger Robot
2019-01-10gitignore: Fix regex for local.properties am: 66dee72aaf am: b5abc3b6c8Felix
am: 18b8823966 Change-Id: I831a1a66cb0eb2fd813f864c92b6ac7218f2ade1
2019-01-10gitignore: Fix regex for local.properties am: 66dee72aafFelix
am: b5abc3b6c8 Change-Id: I4ee0ccc8f6ca72b8333528e34922f7b976e87650
2019-01-10gitignore: Fix regex for local.propertiesFelix
am: 66dee72aaf Change-Id: Id0f99a04c53fa1ac808cb185ef9e202a2e3d8355
2019-01-08Convert Android.mk to Android.bp.Sasha Smundak
See build/soong/README.md for more information Change-Id: I7fd844f966e73deffff3eb355ac06f0afc519b78 Fixes: 122331935 Test: treehugger
2019-01-05gitignore: Fix regex for local.propertiesFelix
This stops e.g. ripgrep from tripping over this malformed regex and spewing errors. Test: Create local.properties in glide root folder: Ignored Create local.properties in library subfolder: Ignored Change-Id: Iafdcbb442842615cb3926e2da2b8ef028f46d7c1 Signed-off-by: Felix <google@ix5.org>
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 371485f971 -s ours am: 9062a55dd4 -s ours am: 0aefa25a06 -s ours Change-Id: Ia05144a686df1b13acb1edcd17a8a90b303bf3d6
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 371485f971 -s ours am: 9062a55dd4 -s ours Change-Id: I83146e2b7399ad2976a738a6a839d0a3757c5ff5
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 371485f971 -s ours Change-Id: I4f0605d0d86c6f85c62f302b30ff774c34a956d6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 17:22:10 +0000