summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-09-22Disable unused Python 2 variant. am: 5dfda218df am: 4487a904e1 am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-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_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseKrzysztof Kosiński
7b182cd345 am: 0430a8a5a1 am: bca6cd4e2d Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2221329 Change-Id: Ic303c1076d57cce8b33f333ddef0f6f50a22a035 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22Disable unused Python 2 variant. am: 5dfda218df am: 4487a904e1 am: ↵android-u-beta-1-gplmain-16k-with-phonesKrzysztof Kosiński
7b182cd345 am: 0430a8a5a1 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2221329 Change-Id: Ib393cccde4ffcf0f8f1bcb649fa4fd44043b02ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Disable unused Python 2 variant. am: 5dfda218df am: 4487a904e1 am: 7b182cd345Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2221329 Change-Id: Idb720dea2f81ed7d904f3e534f598325f109113c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Disable unused Python 2 variant. am: 5dfda218df am: 4487a904e1Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2221329 Change-Id: I0417d937d465d3aef23f8cfdaf61656cb98ffcb3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Disable unused Python 2 variant. am: 5dfda218dfKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2221329 Change-Id: I3943a9a26d70ac9f3a7fc046627d5ca8a0f7d953 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Disable unused Python 2 variant.main-16kKrzysztof Kosiński
Bug: 245854393 Test: presubmit Change-Id: I4daab8bd3843e58ce7ee6ed2aa74bad846da1a70
2022-07-13Escaping double quotes inside the JSON quoted string am: b934b632a7 am: ↵Sadaf Ebrahimi
8b9edb99b0 am: 92207575a2 am: 1cb10625f9 am: 940f416cba Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2152253 Change-Id: Ifdac80a975eead1c99e9e86d40a9538c176dabf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13Escaping double quotes inside the JSON quoted string am: b934b632a7 am: ↵Sadaf Ebrahimi
8b9edb99b0 am: 92207575a2 am: 1cb10625f9 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2152253 Change-Id: I17ac3450425b526f4f181230eac3bc0718916adf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13Escaping double quotes inside the JSON quoted string am: b934b632a7 am: ↵Sadaf Ebrahimi
8b9edb99b0 am: 92207575a2 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2152253 Change-Id: I086747fc8efb990f4077e73a5e19af48775c6959 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13Escaping double quotes inside the JSON quoted string am: b934b632a7 am: ↵Sadaf Ebrahimi
8b9edb99b0 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2152253 Change-Id: Ifff3bbf6a55620f4fe83b7dae0469a3b617fb6a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13Escaping double quotes inside the JSON quoted string am: b934b632a7Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/2152253 Change-Id: I1e50a6fd886716bb35311b4a430ce2ec2d27d615 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12Escaping double quotes inside the JSON quoted stringSadaf Ebrahimi
Test: treehugger Change-Id: I56459298416d827699e18204a990937c92b0109e
2021-11-12Upgrade cryptography from 2.5 to 3.3 am: c6ba99dd61 am: 59e6f3b36b am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-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_331131000android13-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_332714010Lucia Li
3be2d17c44 am: 5b1b2f5ab8 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1888276 Change-Id: I312ce518598bb6d0e2ee4ec1649429e04b8958e1
2021-11-12Upgrade cryptography from 2.5 to 3.3 am: c6ba99dd61 am: 59e6f3b36b am: ↵Lucia Li
3be2d17c44 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1888276 Change-Id: I9b39f457fdee76ce46141acdeaf31982d47ca57b
2021-11-12Upgrade cryptography from 2.5 to 3.3 am: c6ba99dd61 am: 59e6f3b36bLucia Li
Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1888276 Change-Id: I51191746122e9807b77b4b637dbe271f358b848c
2021-11-12Upgrade cryptography from 2.5 to 3.3 am: c6ba99dd61android-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-1Lucia Li
Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1888276 Change-Id: I533bd263468377c53a635ff2ccb8e929da0464fb
2021-11-11Upgrade cryptography from 2.5 to 3.3Lucia Li
Source code is from https://github.com/pyca/cryptography/tree/3.3.x Run setup.py locally and rename _openssl.so/_padding.so Bug: 205265538 Test: None Change-Id: If031739ef5830ba2fb177add74515e4660e2906e
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I83c21c236626503bc60d37f587b57b089c2d2aa6
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/python/cryptography am: af53f8cec9 ↵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
am: b3a18f3d77 am: 77d51c1926 am: 104d218456 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1588575 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6bf852766c5681c0b3718a178ea5b49fa7e8827a
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/python/cryptography am: af53f8cec9 ↵Bob Badour
am: b3a18f3d77 am: 77d51c1926 am: 104d218456 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1588575 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I80b6be898dd34808bd205c29fa61d3ebfb4fcebe
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/python/cryptography am: af53f8cec9 ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-s-v2-preview-1Bob Badour
am: b3a18f3d77 am: 77d51c1926 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1588575 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5594311ec23ff9b2cc945b1e198bcbf2cc8746c
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to external/python/cryptography am: af53f8cec9 ↵Bob Badour
am: b3a18f3d77 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1588575 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I27c0975465a392a5528be745b72f2e9954d253a9
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to external/python/cryptography am: af53f8cec9android-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/python/cryptography/+/1588575 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I746eba4a988a2d43acdc06efbdc3a03a59c4a985
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/python/cryptographyBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp src/cryptography/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Idd06c2e93a3e6ea5c568dd35482a792e1f7f851d
2021-01-14Remove test mapping file for acloud_test am: 1792d62b0f am: 9e4cec5ece am: ↵Julien Desprez
d26c3fb391 Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1549579 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6449305f3cff9466bc24f3cd03fc6270886517e1
2021-01-13Remove test mapping file for acloud_test am: 1792d62b0f am: 9e4cec5eceJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1549579 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1714a314ab1a3aacfd7ed9b9054f8ada362139dd
2021-01-13Remove test mapping file for acloud_test am: 1792d62b0fJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/cryptography/+/1549579 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic42a574c85657a68bce353980db7038d350bbeac
2021-01-13Remove test mapping file for acloud_testandroid-s-preview-1Julien Desprez
Not needed anymore. Test: presubmit Bug: 175408655 Change-Id: I7f9a7907ca102f9fcfcc059cae06a0e0d47cf1bb
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7dee80aacf -s ours am: dc71887f83 am: 3f3fd5269e am: 6e3ac1c7a7 -s ours am skip reason: subject contains skip directive Change-Id: Ic8c04e735932c1c78ae029bf74d52231bd8b5bf6
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7dee80aacf -s ours am: dc71887f83 am: 3f3fd5269e Change-Id: I738a78403160d4af2e503576f72b968e4aac02a9
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7dee80aacf -s ours am: dc71887f83 Change-Id: I1aaea8710cc2f46602d1543c6c7f304eb79a112c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7dee80aacf -s ours am skip reason: subject contains skip directive Change-Id: I2a4788828559bec5ca7402126eafa8eaca27fafa
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: Ifee72da0f4bd2dadf4e00ae4c2740a5f54765855
2020-03-26Remove redundant NOTICE symbolic link. am: 0914f9c149 am: a2f690ebed am: ↵Bob Badour
0f787c52f6 am: f9506a4677 am: 761a60c53d Change-Id: I83aa1b9f914e118e88f8a71ae2b6283696206d1d
2020-03-26Remove redundant NOTICE symbolic link. am: 0914f9c149 am: a2f690ebed am: ↵Bob Badour
0f787c52f6 am: f9506a4677 Change-Id: Ic15a4b2834b3003b998d8bc5d4457d1fbebc14fd
2020-03-26Remove redundant NOTICE symbolic link. am: 0914f9c149 am: a2f690ebed am: ↵Bob Badour
0f787c52f6 Change-Id: I44953bc5769cd807b4722ed624786b55beef58e3
2020-03-26Remove redundant NOTICE symbolic link. am: 0914f9c149 am: a2f690ebedBob Badour
Change-Id: Iac55750c309e5b0c1c6dc98b997207666996de86
2020-03-26Remove redundant NOTICE symbolic link. am: 0914f9c149 am: a2f690ebedBob Badour
Change-Id: I872a287c4984886d8052f9a34a18b539dc5c2e63
2020-03-26Remove redundant NOTICE symbolic link. am: 0914f9c149Bob Badour
Change-Id: Ieb850b97d3287636dfd160e8b60978e894ce3690
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ib8932451b9a842ad77ad44a2e203818b1ff63c7e
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_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
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 0a934061cf am: e892a62257 -s ours am skip reason: subject contains skip directive Change-Id: I67931cb64b93ee9af0fad6373cb39b4aa78afaa5
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 0a934061cf Change-Id: I53d5e1341a3df2970d6a448efef8c37ab3adb44e
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ia41e72df732a1f779dd0c4eb0f39a419685e5193
2019-07-24Add in TEST_MAPPING for acloud unittests. am: e9a9eff135 am: 1e870d094f am: ↵Kevin Cheng
421e37f785 am: d34e731b1f am: 6aa5607fc9 Change-Id: I371d0a37b3179dab5b06c6b49c4bc3f6b0b20040
2019-07-23Add in TEST_MAPPING for acloud unittests. am: e9a9eff135 am: 1e870d094f am: ↵Kevin Cheng
421e37f785 am: d34e731b1f Change-Id: I051fc93216c4dcf0646d14374ba043239a227697
2019-07-23Add in TEST_MAPPING for acloud unittests. am: e9a9eff135 am: 1e870d094fKevin Cheng
am: 421e37f785 Change-Id: I7a129e16f4f0723f38a4d8bbb8fc39f4236b3b9c
2019-07-23Add in TEST_MAPPING for acloud unittests. am: e9a9eff135Kevin Cheng
am: 1e870d094f Change-Id: I9daf4bdee68553036cd2850c008e3d57b5b6dbc1
2019-07-23Add in TEST_MAPPING for acloud unittests.ndk-sysroot-r21Kevin Cheng
am: e9a9eff135 Change-Id: I71869de7484adf0208b9088ba8aea713e11d601c
2019-07-23Add in TEST_MAPPING for acloud unittests.Kevin Cheng
Bug: 124250384 Test: atest Change-Id: I173e66efd8a938d815598b9d844cc34dcff94520
2019-05-09Merge commit '83aa36d' into import am: 4db398a410 am: 6a131d157fKevin Cheng
am: 4db6738c5f Change-Id: If66eea495e7b7282485ad7ced53fecde36995550