aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-16Snap for 8736029 from 1f78690480e043c9a3bcc5ce5b11778280ddf3ad to ↵aml_go_swc_330913000android13-mainline-go-media-swcodec-releaseAndroid Build Coastguard Worker
mainline-go-media-swcodec-release Change-Id: I8c3cb51d628ae3978deb690f15b7afc993d7eaff
2022-03-02Update rusqlite to 0.27.0 am: 82c86ae98e am: 8386405f4f am: 8e934d15c4 am: ↵aml_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_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010David LeGare
93c8cc61e4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2006011 Change-Id: I51755a378ec473338367ada10f64c2fa4c642863
2022-03-02Update rusqlite to 0.27.0 am: 82c86ae98e am: 8386405f4f am: 8e934d15c4t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2006011 Change-Id: Id37e832138a66e56e7ba634631e6517b66bd2ff0
2022-03-02Update rusqlite to 0.27.0 am: 82c86ae98e am: 8386405f4fDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2006011 Change-Id: Iec04da8f465595cbaa146906aaa8afd21c967d0c
2022-03-02Update rusqlite to 0.27.0 am: 82c86ae98eDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2006011 Change-Id: I7caacb035a278ca689762ee8c4af507f9646ad72
2022-03-02Update rusqlite to 0.27.0David LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: I70534db15d833dae7d254e1d772c1da6d35072ab
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e3192e4d6d ↵Joel Galenson
am: 2a0fc9eb6e am: d7b28d8ec1 am: 47903fb615 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1912660 Change-Id: Idfe469a154a0f09e81e91eb9b59a405824fbc033
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e3192e4d6d ↵Joel Galenson
am: 2a0fc9eb6e am: d7b28d8ec1 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1912660 Change-Id: Id35af50b752d3a4c48cbf66a08b1a4622467c83d
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e3192e4d6d ↵Joel Galenson
am: 2a0fc9eb6e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1912660 Change-Id: Ie6ec46adf78a239c3fe23a4fad4de476e1132b46
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e3192e4d6dJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1912660 Change-Id: Ie0884c0db1496b87ebeb586f748a2e3b3781ad61
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."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-1Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Test: None Change-Id: I76d108895316475cb1510af88aebbf2c61603cf9
2021-10-25Rename cargo2android.py control file. am: 43008c563b am: c12ac9ce6e am: ↵Joel Galenson
ef263b1d58 am: 338c08af96 am: 9e01ae26de Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1861894 Change-Id: If434c49861fcdc9efe161a9003f70e2d5cef52e2
2021-10-25Rename cargo2android.py control file. am: 43008c563b am: c12ac9ce6e am: ↵Joel Galenson
ef263b1d58 am: 338c08af96 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1861894 Change-Id: I906abcc7b7e832141f501473a75c8545ce8b8f64
2021-10-25Rename cargo2android.py control file. am: 43008c563b am: c12ac9ce6e am: ↵Joel Galenson
ef263b1d58 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1861894 Change-Id: Ida29620f861ef841e2a3eda618b48c3907ac7536
2021-10-25Rename cargo2android.py control file. am: 43008c563b am: c12ac9ce6eJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1861894 Change-Id: I28a0c972d398b53c582195e49ce995a61ccccc08
2021-10-25Rename cargo2android.py control file. am: 43008c563bJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1861894 Change-Id: I5b1fe942d67cec4d825600c48c99f26ca1764fc5
2021-10-18Rename cargo2android.py control file.android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
The external updater only copies over files prefixed with cargo2android to the new location, so the current version of the file means the updater fails. Test: Update the package. Change-Id: I76c20bd8a9f8cc611ad9eb3f7b3a1454f98a24ec
2021-09-15Add librusqlite_noicu am: 4dd7486c10 am: e4574c5a1d am: 997b5688d0 am: ↵Jiyong Park
d4a98993e0 am: 1f25fc82a6 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1825194 Change-Id: I59d1a87487f159a1d223af1c2965e031f227c884
2021-09-15Add librusqlite_noicu am: 4dd7486c10 am: e4574c5a1d am: 997b5688d0 am: ↵Jiyong Park
d4a98993e0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1825194 Change-Id: I18fa105769dd066846c896fbda06ef4f5480e433
2021-09-15Add librusqlite_noicu am: 4dd7486c10 am: e4574c5a1d am: 997b5688d0Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1825194 Change-Id: I2abd95512c73b2fc626b66a666cc65fc3cf37283
2021-09-15Add librusqlite_noicu am: 4dd7486c10 am: e4574c5a1dJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1825194 Change-Id: I541546b85d09288cd9ea8ffa981ced179aa87092
2021-09-15Add librusqlite_noicu am: 4dd7486c10Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1825194 Change-Id: I3fe6b3ef93e6ba85e9f8a7b23c5d8a5fc7c41ccf
2021-09-14Add librusqlite_noicuJiyong Park
librusqlite_noicu is a variant of librusqlite which is linked to libsqlite built with no ICU extension support. This variant is intended to be used in environments where the ICU extension is not needed and the dependency to ICU (which is as large as 60+ MB) is not desirable, like microdroid. Bug: 199674764 Test: m Change-Id: I7a1412baa449606939dd291f51bccc871f306ec1
2021-08-18Add trace feature to rusqlite crate am: 5671788de6 am: 0a5a6bd7f7 am: ↵Seth Moore
4867b3f15e am: b6e10f1936 am: 6b719d5295 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1799227 Change-Id: I25cb3719069d71d2231f988b4b3add31a38c5342
2021-08-18Add trace feature to rusqlite crate am: 5671788de6 am: 0a5a6bd7f7 am: ↵Seth Moore
4867b3f15e am: b6e10f1936 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1799227 Change-Id: I3506ef948da4a1787c9cbf9423115bf7f517414c
2021-08-18Add trace feature to rusqlite crate am: 5671788de6 am: 0a5a6bd7f7 am: 4867b3f15eSeth Moore
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1799227 Change-Id: Iaa6f54c10e2935aefb9dcd80d3f72f683feb5ecf
2021-08-18Add trace feature to rusqlite crate am: 5671788de6 am: 0a5a6bd7f7Seth Moore
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1799227 Change-Id: Iaacfb2fedc79e9fd694ff46982683ed564496bfb
2021-08-17Add trace feature to rusqlite crate am: 5671788de6Seth Moore
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1799227 Change-Id: If10a53438252527f0d8f85f101bff0b1daeb22f7
2021-08-17Add trace feature to rusqlite crateandroid-s-beta-5android-s-beta-5Seth Moore
Android.bp file was regenerated by running: cargo2android.py --device --run --features=modern_sqlite,trace Test: keystore2_test, legacykeystore_test Change-Id: Ie8b44b18e85b65ab9edc35e0d5e04f02afe4732d
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
2cd3adb0f3 am: fb003e2604 am: 78e1420f42 am: f3c37bc6cf Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1755990 Change-Id: I8c74eaa8a4af5694964c540a97004a439e483545
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
2cd3adb0f3 am: fb003e2604 am: 78e1420f42 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1755990 Change-Id: I04e3fa494bc756e1a981f51acc006ec3fc9e12db
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
2cd3adb0f3 am: fb003e2604 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1755990 Change-Id: I017f4f52dc5fee8d40ccb7f0a7b57963d342656e
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
2cd3adb0f3 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1755990 Change-Id: I22be1ad0e5393a36033893b038bccc0e832d4f33
2021-07-05Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPINGandroid-s-beta-4android-s-beta-3android-s-beta-4easoncylee
The test had been changed to legacykeystore_test from ag/14968529 Bug: 192796637 Test: presubmit Change-Id: I126de9fd89987000bbcba0a59d0befd27e94cf99
2021-05-27Merge sc-mainline-prod to master.Bill Rassieur
Change-Id: I79edafb71ca7b57c301a21e3bc82b2e8f6918104
2021-05-26Upgrade rust/crates/rusqlite to 0.25.3 am: 570a929070 am: 68e86d6915 am: ↵Joel Galenson
7f25b68873 am: 578b561123 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1713208 Change-Id: If386dbee94f40af3586f485f04fb92d1beca95b7
2021-05-26Upgrade rust/crates/rusqlite to 0.25.3 am: 570a929070 am: 68e86d6915 am: ↵Joel Galenson
7f25b68873 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1713208 Change-Id: I3bc64efeb9123181f9868fcdcdc10ec2a762c26a
2021-05-26Upgrade rust/crates/rusqlite to 0.25.3 am: 570a929070 am: 68e86d6915Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1713208 Change-Id: I1493bb0929d44264a7de2f4007ba08f71a0f3ddd
2021-05-26Upgrade rust/crates/rusqlite to 0.25.3 am: 570a929070Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1713208 Change-Id: Ic5bcdc53130a816bb6dd85b1a6f96ee200af0641
2021-05-19Upgrade rust/crates/rusqlite to 0.25.3Joel Galenson
Test: make Change-Id: I2a2dc5a65f9f6f250997064258004a800885a39c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d140ad0c78 -s ↵Xin Li
ours am: 181d05b414 -s ours am: 0f8d0e124a -s ours am skip reason: Change-Id I8676462487dad5556cd9aea8377de8de0ac56433 with SHA-1 8ec3ca030f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I32ad6008621f5f3d29012c11e5b769080099694b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d140ad0c78 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-releaseXin Li
ours am: 181d05b414 -s ours am: 0f8d0e124a -s ours am skip reason: Change-Id I8676462487dad5556cd9aea8377de8de0ac56433 with SHA-1 8ec3ca030f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17bfb9f8f19702d09b56382c4ff984fbcc1c87e9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d140ad0c78 -s ↵android-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-releaseXin Li
ours am: 181d05b414 -s ours am skip reason: Change-Id I8676462487dad5556cd9aea8377de8de0ac56433 with SHA-1 8ec3ca030f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I529c89492b9e01116e6d2e6f5a5b12060a57cf2e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d140ad0c78 -s oursXin Li
am skip reason: Change-Id I8676462487dad5556cd9aea8377de8de0ac56433 with SHA-1 8ec3ca030f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibb37468794742f4a3305cb3a463636910a63db3d
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I8676462487dad5556cd9aea8377de8de0ac56433 Change-Id: I0061fd671781a194fc9503fe660ca4f9720b4a6b
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/rusqlite am: ↵Bob Badour
995977f838 am: 17af001bdc am: 0f2156bbc9 am: 057bf4b0dc Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1587405 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I31256b2d1754e091a409db9eb3dea66da68b8dfe
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/rusqlite am: ↵Bob Badour
995977f838 am: 17af001bdc am: 0f2156bbc9 am: 057bf4b0dc Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1587405 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3d1ecb5c13b7a7ba741b397f3681766f560194c3
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/rusqlite am: ↵Bob Badour
995977f838 am: 17af001bdc am: 0f2156bbc9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1587405 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie0ea8821e22a3407d129f10aeb314df2b883f03a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/rusqlite am: ↵Bob Badour
995977f838 am: 17af001bdc Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/1587405 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I298059c6212126560084525aee15c49769ce41f5