summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-11[automerger skipped] Empty merge of ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060android-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_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_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341717000aml_odp_341610000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-devandroid13-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-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2c0e20b987 -s ours am: 80c1198a04 -s ours am skip reason: Merged-In I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 with SHA-1 09ecab8aca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/16843712 Change-Id: I732aebd5bfa607510ec4405f1b3af58bb701bc6e
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2c0e20b987 -s ours am skip reason: Merged-In I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 with SHA-1 09ecab8aca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/16843712 Change-Id: I3e7d8d5bd14e8bb4047738674aa6d00ae0067a0c
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 Change-Id: I522d4ea346cdf7953016c941c9b4da65468bec78
2022-02-09Merge "mtpd: switch OWNERS to core networking" am: 54d99ce67f am: 66342cbc28 ↵Treehugger Robot
am: 3e92ced976 am: 66ecca4ab8 Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1976871 Change-Id: I712e9f6a850a1e59623c120df9e9d7edb2d25224
2022-02-09Merge "mtpd: switch OWNERS to core networking" am: 54d99ce67f am: 66342cbc28 ↵Treehugger Robot
am: 3e92ced976 Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1976871 Change-Id: I5f1478fb6e2837e92940e970dc3c2337194656cb
2022-02-09Merge "mtpd: switch OWNERS to core networking" am: 54d99ce67f am: 66342cbc28Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1976871 Change-Id: I879ef09e9d787b4e24f2705740e9980385313ba9
2022-02-09Merge "mtpd: switch OWNERS to core networking" am: 54d99ce67fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1976871 Change-Id: Ia2da9bba7e3e6d7af69326e30ee273350882c86b
2022-02-09Merge "mtpd: switch OWNERS to core networking"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2022-02-08mtpd: switch OWNERS to core networkingMaciej Żenczykowski
(effectively a no-op, just more directly accomplishes the same thing) Test: N/A, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I0d8ce02ea6553ae8675b8a0dfb4f96cc1185a589
2021-06-03[automerger skipped] Enable Async MTE in mtpd. am: 09ecab8aca am: 1b926ebfe8 ↵Evgenii Stepanov
-s ours am skip reason: Merged-In I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 with SHA-1 09ecab8aca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/14793304 Change-Id: Iea21193251e584f9f07866428749d243b967fd2d
2021-06-02[automerger skipped] Enable Async MTE in mtpd. am: 09ecab8aca am: 27b13a1496 ↵Evgenii Stepanov
-s ours am: 9d006e0e05 -s ours am skip reason: Merged-In I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 with SHA-1 09ecab8aca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/14793304 Change-Id: I5dfc6ea34f567831c48d23c1b094fc0fac5049f5
2021-06-02[automerger skipped] Enable Async MTE in mtpd. am: 09ecab8aca -s ours am: ↵Evgenii Stepanov
3f0f181b9a -s ours am: b4fd2e7b55 -s ours am skip reason: Merged-In I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 with SHA-1 e4ca2c43fe is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/14793304 Change-Id: Ic7fe6b55959d8ef6e110fcba8317133ff39a5cf7
2021-06-02[automerger skipped] Enable Async MTE in mtpd. am: 09ecab8aca am: 27b13a1496 ↵Evgenii Stepanov
-s ours am skip reason: Merged-In I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 with SHA-1 09ecab8aca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/14793304 Change-Id: I85e4890a19b0c2ca88a63daee00b258a2b6cb67f
2021-06-02[automerger skipped] Enable Async MTE in mtpd. am: 09ecab8aca -s ours am: ↵Evgenii Stepanov
3f0f181b9a -s ours am skip reason: Merged-In I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 with SHA-1 e4ca2c43fe is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/14793304 Change-Id: Ie3eb6378d75e3202ac4c0980366ff938558e91f0
2021-06-02Enable Async MTE in mtpd. am: 09ecab8acaandroid-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_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseEvgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/14793304 Change-Id: I22101720ebbef0a1a95a1a13a496a5842de1c766
2021-06-02Enable Async MTE in mtpd. am: 09ecab8acaandroid-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-releaseEvgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/14793304 Change-Id: I608f88600e3102299b6f791b9b0f5948dc148ab1
2021-06-02[automerger skipped] Enable Async MTE in mtpd. am: 09ecab8aca -s oursandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Evgenii Stepanov
am skip reason: Merged-In I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 with SHA-1 e4ca2c43fe is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/14793304 Change-Id: I0ecd0393716f74b248527b319ef115833ac44645
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Icb129036eb37610bf7ae3b236788a3e369de4476
2021-06-01Enable Async MTE in mtpd.android-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_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devEvgenii Stepanov
This change enables Async mode ARM MTE in mtpd on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/netd/tests Change-Id: I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 Merged-In: I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 (cherry picked from commit e4ca2c43fe67150c400afeeb7bf3b4c6ea95f880)
2021-05-28Merge "Enable Async MTE in mtpd." am: ded2dfba4d am: 442ebd2656 am: ↵Maciej Żenczykowski
84fe0e16cb am: 35fb28ca4a Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1721551 Change-Id: Ieca9555467d8be1dbaff450c3b941fb7b93e193d
2021-05-28Merge "Enable Async MTE in mtpd." am: ded2dfba4d am: 442ebd2656 am: 84fe0e16cbMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1721551 Change-Id: Ie3de1120206bee3a25e7e94e2710eb6104d01f46
2021-05-27Merge "Enable Async MTE in mtpd." am: ded2dfba4d am: 442ebd2656Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1721551 Change-Id: I36fae3afb3fe1c16e8db4abedf57aa23a4ce7f29
2021-05-27Merge "Enable Async MTE in mtpd." am: ded2dfba4dandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1721551 Change-Id: I2e1fa378cabda5e1893bc6f86ea02fb050f1a8a8
2021-05-27Merge "Enable Async MTE in mtpd."Maciej Żenczykowski
2021-05-26Enable Async MTE in mtpd.Evgenii Stepanov
This change enables Async mode ARM MTE in mtpd on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/netd/tests Change-Id: I4405d2bc1254fc65ff044a878ac1abd99f7ffc89
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd" am: 2c7cca207c am: ↵Bob Badour
a3eea271bb am: 2b2f1ebae8 am: 19e73ac94a Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1588898 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib659fa6f7a18e39dce9f2c240dcb8b6c5a00bdf2
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd" am: 2c7cca207c am: ↵Bob Badour
a3eea271bb am: 2b2f1ebae8 am: 19e73ac94a Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1588898 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I57e57532bddfe382c22a307d8164fd84f8488912
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd" am: 2c7cca207c am: ↵Bob Badour
a3eea271bb am: 2b2f1ebae8 Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1588898 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia26b48b4039ea3f10a0d1ec93a1b97bf376e785b
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd" am: 2c7cca207c am: ↵Bob Badour
a3eea271bb Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1588898 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I87f77fcbcfc3d64ea3b0c69ea148360e51960d37
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd" am: 2c7cca207candroid-s-beta-2android-s-beta-1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1588898 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5e3a6b86f55e6883ee50cda3d6bd1d24f517fbf
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/mtpdBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I940e99a61a5b32b8ddde220fa36f7cde12123858
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde am: e32bc00d9b ↵Treehugger Robot
am: 02856a9f67 am: 58fefd8f85 am: e6a17ff0ce Change-Id: Ib784dd3e2166de16140a8e2fb37fb7a8fcf0f848
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde am: e32bc00d9b ↵Treehugger Robot
am: 02856a9f67 am: 58fefd8f85 Change-Id: I3cfecbf3b2deb0708102248254e33e15b046079a
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde am: e32bc00d9b ↵Treehugger Robot
am: 02856a9f67 Change-Id: Id470a155c28aeabc88b43cd7c5d95f1251e9320c
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde am: e32bc00d9bTreehugger Robot
Change-Id: I69cbdb11f4bd5abe6c81286e3c77e670acbdfc38
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bdeandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I28c5f2cdcbe0ecdbd7bb6b19fe7e24a67080bb78
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to mtpd: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ib502a4f946a961a130197e8617a0e4391f2d2be8
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: d7faaf63dc am: 83bd1754f3r_aml_301500702android-mainline-12.0.0_r55android-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-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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_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_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-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_r10android11-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-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-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
am: 106b0e350a Change-Id: I505fe1176b5d4c63bbff110ccd5dc8c43b31694f
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: d7faaf63dcq_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-r-preview-4android-r-preview-3android-r-preview-2android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r8android-mainline-10.0.0_r6android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 83bd1754f3 Change-Id: I9236de96ebe98156d5e9c1295bbef9745ff9ab7d
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: d7faaf63dc Change-Id: I238e7659d3da2723865a409f65f0775361cae79d
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterandroid-r-preview-1Xin Li
Bug: 141248619 Change-Id: I6c77fbc2757140bbb7d144be09c10711ac9970d6
2019-05-30Snap for 5616560 from ca7860c5d1284f84e77ad850441b8bb00d1f4625 to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot
qt-c2f2-release Change-Id: Ic81ae663759eed795b0fe256cb241bd391625310
2019-05-28Merge "[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 ↵Alistair Strachan
am: ca7860c5d1 -s ours am: 8c3910aa89 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: I55a193dcf2e40c653d67b30091f8167f81d7e8a1
2019-05-28[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 -s ours ↵Alistair Strachan
am: b4b0bd6e43 -s ours am: 11150b23b4 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: I80f0f11a97fd022fddc2164cc66c40b938d6437a
2019-05-29Merge "[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 ↵Android Build Merger (Role)
am: ca7860c5d1 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history" into qt-r1-dev-plus-aosp
2019-05-28[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 -s oursAlistair Strachan
am: b4b0bd6e43 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: Iccbcea349daa16b5eea88733a72fd0c0952a839c
2019-05-28[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6Alistair Strachan
am: ca7860c5d1 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: Id2edff424477b7d702ff1cf9a916ca886dbfc415
2019-05-28Try OPNS/OLAC before PPTP/L2TPandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-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_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseAlistair Strachan
am: a378c558d6 Change-Id: I6424dfadcd77874edd1095066b1ec612b32eeea1