aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: Ib84685c96ac6b9448656882a2ad963b7248f3804 Change-Id: Ibbab10a3ac9d000dad84fafc9a7556df7341d6f8
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b Change-Id: Ib84685c96ac6b9448656882a2ad963b7248f3804
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 189dd28362 -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: f4457bc8f0 -s ours am skip reason: Change-Id Idfe5f25234cd6e6bd641d912524681304fa08752 with SHA-1 c9570b2a21 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 189dd28362 -s oursXin Li
am skip reason: Change-Id Idfe5f25234cd6e6bd641d912524681304fa08752 with SHA-1 c9570b2a21 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I832cae4bed3abd0e65c2760b1becf3ecdfe75609
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Idfe5f25234cd6e6bd641d912524681304fa08752 Change-Id: I3f94a2234374a075814fe3d79510d53726476ecb
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540ab ↵Treehugger Robot
am: f091fdc072 am: 9568387c2d Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1588941 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1fcb31eb491fb27b0417afa9485eee4215f1c8ab
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540ab ↵Treehugger Robot
am: f091fdc072 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1588941 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9926ac4a2505dba441959482db22301d8cf049ef
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540abTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1588941 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2bda105c537d7605958656dd44ee29ef8b1558d0
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trieBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-BSD-2-Clause SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1+ to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I02a8413f0e8d2b2f8a6342b694f49478337885aa
2021-01-22Merge "Fix license_type. "AND GPL"" am: 2755ec422c am: 2106d984d9 am: 2340e8d75dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1556647 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I140605d29733da43e8e1e441746a45d174a8e9a0
2021-01-22Merge "Fix license_type. "AND GPL"" am: 2755ec422c am: 2106d984d9Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1556647 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id34c2526e9d50e06ad7e90deec23f4d819b93ed1
2021-01-22Merge "Fix license_type. "AND GPL"" am: 2755ec422cBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1556647 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97737bf57981d81aae9b9e68e5828320d0a6c483
2021-01-22Merge "Fix license_type. "AND GPL""Bob Badour
2021-01-21Fix license_type. "AND GPL"Bob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: If4474510e03370cf430ef5d162d614a7d68e9833
2020-11-24Mark ab/6881855 as merged am: 2c82f6be73 am: c9570b2a21Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/13111225 Change-Id: Ie9ebfed5d0d426114bfd10bfcf4cd5fa328a513b
2020-11-24Mark ab/6881855 as merged am: 2c82f6be73Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/13111225 Change-Id: Idfe5f25234cd6e6bd641d912524681304fa08752
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I8e3cd4bae1e7882589395d943d74bafee346df38
2020-11-03[automerger skipped] Set min_sdk_version to be 30 am: ae3315be4a -s oursTony Mak
am skip reason: Change-Id Ifd74d99bcd457f838d09e087dcff37fb69e0793a with SHA-1 d1c8e74168 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12973716 Change-Id: I5303831bba3fa7317e469a8b4b5894103cf03ba1
2020-11-03Set min_sdk_version to be 30android-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseTony Mak
Bug: 170298047 Test: m com.android.extservices Merged-In: Ifd74d99bcd457f838d09e087dcff37fb69e0793a Change-Id: Ifd74d99bcd457f838d09e087dcff37fb69e0793a
2020-11-02Set min_sdk_version to be 30Tony Mak
Bug: 170298047 Test: m com.android.extservices Change-Id: Ifd74d99bcd457f838d09e087dcff37fb69e0793a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d73a42d329 -s ours am: ↵Xin Li
a0553ee959 -s ours am: 069ff9539d -s ours am skip reason: Change-Id Ifd79e860d43ff2756c64858fb05d85e6fca9788b with SHA-1 c1175ad8ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12797070 Change-Id: I0493bd795fb0cf5e913614f38a1608a2cb296131
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d73a42d329 -s ours am: ↵Xin Li
a0553ee959 -s ours am skip reason: Change-Id Ifd79e860d43ff2756c64858fb05d85e6fca9788b with SHA-1 c1175ad8ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12797070 Change-Id: I04014aedcf9a490895d12cc941eb40820ac88985
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d73a42d329 -s oursXin Li
am skip reason: Change-Id Ifd79e860d43ff2756c64858fb05d85e6fca9788b with SHA-1 c1175ad8ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12797070 Change-Id: If49a7782a09838f0677bd5dbf758b3316df88912
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ifd79e860d43ff2756c64858fb05d85e6fca9788b Change-Id: I9d04a5e748acff9dd34494e59a81fba177eed9f7
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c ↵Treehugger Robot
am: b2c0024b8a am: 0f1f759109 am: c39e1b2fde am: 77657a57f9 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: I480d4c36a7e8f46deb0784d4edb7b2692ce9f16d
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c ↵Treehugger Robot
am: b2c0024b8a am: 0f1f759109 am: c39e1b2fde Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: Id9c2f0b54de88aed6942226c325db351673d45a3
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c ↵Treehugger Robot
am: b2c0024b8a am: 0f1f759109 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: I468c31f4fd5f580b29fd4b6112979cb635d61656
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c ↵Treehugger Robot
am: b2c0024b8a Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: I9962895832b419a786fba54a587d838754ae1fae
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: I4f8f9ae71cb32ec11cf5ed8d720516fc4e4871f9
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32"platform-tools-30.0.5Treehugger Robot
2020-09-28Sync https://github.com/s-yata/marisa-trie/pull/32Tony Mak
This allows us from disabling exception support for the whole libtextclassifier. The PR was accepted. Cherrypicking the change for now until the library version is bumped. Bug: 148777789 Test: Treehugger Change-Id: If0099adaca2dc046a1870f11bf7eeeda8c4c2ce9
2020-08-27[automerger skipped] Mark Android R ↵android-mainline-11.0.0_r9android-mainline-11.0.0_r35android-mainline-11.0.0_r3android-mainline-11.0.0_r29android11-mainline-sparse-2020-dec-releaseXin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am: 570fb1d38e -s ours am: 43c2a7b282 -s ours am: bc8b870cd7 -s ours am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12469816 Change-Id: I6e6dc73b3e688bb202b6a4270698d24261695afb
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am: 570fb1d38e -s ours am: 43c2a7b282 -s ours am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12469816 Change-Id: If5a9be7eeaa7eaa20d161059345e057dda37afd6
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am: 570fb1d38e -s ours am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12469816 Change-Id: I37b3530ab58f71b063c2c0a2ff00ad726e68a4b2
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12469816 Change-Id: I2333a7227516af360143ae0fa8b74d22d84218c6
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: Ic91ee1134eb9cc96b09970635ad26da3e0246910 Change-Id: I5f423ddf18417327d2bff31b1023e043ec57820d
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926e am: ↵Tony Mak
9213245acc am: c1175ad8ed am: c3a0901d58 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: I8b967437baae9ed108a4924e9c6fa7114773bb1f
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926e am: ↵Tony Mak
9213245acc am: c1175ad8ed Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: I7613c6b2db63b834d441bc93c3930b32d7f8b7cf
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926e am: ↵Tony Mak
9213245acc Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: Ifd79e860d43ff2756c64858fb05d85e6fca9788b
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926eTony Mak
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: Ia73ec701e4f94a4ec23604c6fbf4e8463cb27159
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6dfTony Mak
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: I7b3928f44dac9bb0a70fd43a69908d6ab60a2810
2020-07-23Merge "Create Android.bp for marisa-trie"Tony Mak
2020-07-22Create Android.bp for marisa-trieTony Mak
Those test files are not gtest based and so they are incompatible with cc_test, so I put them as cc_binary instead. Bug: 161375689 Test: mmm external/marisa-trie/ Change-Id: I54a004a6e4bec4d28cf503558893a92ec526456e
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 am: 2ea6e854d5 am: a7cf57e5e4 am: 4362d91ea1 am: 6705e199ca Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I1cb038177f96183ed4f155ff4761f721cf0a7c9f
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 am: 2ea6e854d5 am: a7cf57e5e4 am: 4362d91ea1 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I728bb96694a7453775e0b5f15093198976a7ab65
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 am: 2ea6e854d5 am: a7cf57e5e4 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I83059d09fbedfa36d595375de0d353eda66a0ea6
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 am: 2ea6e854d5 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I9ff2e7b802aea08024bea3020943b5943a5ebe02
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I3d02a474f986d3ee93103700316271aa5a03f417
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 14:19:31 +0000