summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s oursXin Li
am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: I2684c63f3e949092af2267b95ee6f7eb414062bc
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Id7ed53db36cdb9e96c352253ca5c05cc193bb90b Change-Id: I31f722e8e4520f9d82b6c96e8fdfd3b39a9559c1
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 187c51de8b -s ours am: 21f1bc963d -s ours am: e7e8a16b75 -s ours am: 5e5fe06de6 -s ours am skip reason: Change-Id Iff102d5d44046659da3ebe0b13b7f3390f056bcc with SHA-1 c1541edc08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12470197 Change-Id: Ib118f312e7a6cf1f5979230d1bddd50117fc8f43
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 187c51de8b -s ours am: 21f1bc963d -s ours am: e7e8a16b75 -s ours am skip reason: Change-Id Iff102d5d44046659da3ebe0b13b7f3390f056bcc with SHA-1 c1541edc08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12470197 Change-Id: I5ab5214a00fdb7d01dca32b95c1f9604748ffa3d
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 187c51de8b -s ours am: 21f1bc963d -s ours am skip reason: Change-Id Iff102d5d44046659da3ebe0b13b7f3390f056bcc with SHA-1 c1541edc08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12470197 Change-Id: I8def8e5c4d60a958d464b6b167d884b8d8ff4f14
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 187c51de8b -s ours am skip reason: Change-Id Iff102d5d44046659da3ebe0b13b7f3390f056bcc with SHA-1 c1541edc08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12470197 Change-Id: I47c468915ca5137ce3c2243fcea7a6dbe66fc78d
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Iff102d5d44046659da3ebe0b13b7f3390f056bcc Change-Id: Id7ed53db36cdb9e96c352253ca5c05cc193bb90b
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: ↵Treehugger Robot
e4285b0992 am: 8463287886 am: c1541edc08 am: 766f3fab08 am: 8eb642ba1f Change-Id: I13b223c1956627159df7b2273a2eefad94e780a2
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: ↵Treehugger Robot
e4285b0992 am: 8463287886 am: c1541edc08 am: 766f3fab08 Change-Id: Ia1a0c8447b704bd7cd24c8dcd29dd3395857e650
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: ↵Treehugger Robot
e4285b0992 am: 8463287886 am: c1541edc08 Change-Id: I25d173f4757e675caf00abd3eae2984e988e8ed4
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: ↵Treehugger Robot
e4285b0992 am: 8463287886 Change-Id: Iff102d5d44046659da3ebe0b13b7f3390f056bcc
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: e4285b0992android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I30b6870041a194465b8769d3af064b0d4ae56f42
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider"Treehugger Robot
2020-04-27Remove MODULE_LICENSE_APACHE2 from UserDictionaryProviderBob Badour
Repositories containing third-party code need a METADATA and a license_type. Repositories containing only first-party code no longer need a MODULE_LICENSE_* file. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I8ef452dd54a6d8bff670793dbe9c83ac36c5a74a
2019-12-04Merge "Merge Android10 QPR1 into AOSP master" am: 4848226fab am: 2150129abar_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-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-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-releaseaml_tz2_305400100Automerger Merge Worker
Change-Id: Ic44693dc150c2a85a7a5b1902ac2ce8916fabdc2
2019-12-04Merge "Merge Android10 QPR1 into AOSP master" am: 4848226fabandroid-r-preview-4android-r-preview-3android-r-preview-2Xin Li
am: 06055db0e8 Change-Id: Ia9e8e516ba0e56e6ea55d97ff0322f571b453ca1
2019-12-03Merge "Merge Android10 QPR1 into AOSP master"Xin Li
am: 4848226fab Change-Id: I0713698648bc1f742bf39cec41fa707d9b3c2170
2019-12-03Merge "Merge Android10 QPR1 into AOSP master"android-r-preview-1Treehugger Robot
2019-12-02Merge Android10 QPR1 into AOSP masterXin Li
Bug: 145570283 Change-Id: I0c8f863c2ad5a8185b020c2b3ec5ec9d0a89a148
2019-10-31[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 4e12559f3b am: 57fadf1b76 -s ours am skip reason: subject contains skip directive Change-Id: I5e40a356ff583a93d317a3dff40598712841a4b8
2019-10-31DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 4e12559f3b Change-Id: Ie01802dda7bc76d662fa1965c422d850794296a7
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵temp_b_145570283Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I3c4fd366af8f478e38c4bec9651612d2de2bfa09
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 2f183eb436 -s ↵Xin Li
ours am: a9bed03090 -s ours am: d480d71bc2 -s ours am: bb799b878a -s ours am skip reason: change_id Ia674d6df39bfa575ec58687303436df55ba94a3e with SHA1 0185aa3fc9 is in history Change-Id: I08d77b54302e7d9ee26e621e23d80cf1ac232b20
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 2f183eb436 -s ↵Xin Li
ours am: a9bed03090 -s ours am: d480d71bc2 -s ours am skip reason: change_id Ia674d6df39bfa575ec58687303436df55ba94a3e with SHA1 0185aa3fc9 is in history Change-Id: If3b0b7fb57194465a5a8403045438ae7d07ff140
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 2f183eb436 -s oursXin Li
am: a9bed03090 -s ours am skip reason: change_id Ia674d6df39bfa575ec58687303436df55ba94a3e with SHA1 0185aa3fc9 is in history Change-Id: Id8431f134fceae0bce1c0052656b768f5e4c428f
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP masterXin Li
am: 2f183eb436 -s ours am skip reason: change_id Ia674d6df39bfa575ec58687303436df55ba94a3e with SHA1 0185aa3fc9 is in history Change-Id: I8856e4820528fd63e58038adb5c6407203f7df2f
2019-10-25Merge Coral/Flame into AOSP masterXin Li
Bug: 141248619 Change-Id: Iba7609a5bb883e5919e4e539609b7d91353a145c Merged-In: Ia674d6df39bfa575ec58687303436df55ba94a3e
2019-09-25[automerger skipped] Import translations. DO NOT MERGE am: 0185aa3fc9 -s ↵Bill Yi
ours am: 7776da9100 -s ours am: 8b82cf44ec -s ours am skip reason: subject contains skip directive Change-Id: I7e8ddf68fa148731cbb724603532d1816319d7f5
2019-09-25[automerger skipped] Import translations. DO NOT MERGE am: 0185aa3fc9 -s oursBill Yi
am: 7776da9100 -s ours am skip reason: subject contains skip directive Change-Id: Ib691073666da77003b8390e11a5baabc4e449e43
2019-09-25[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 0185aa3fc9 -s ours am skip reason: subject contains skip directive Change-Id: Id4bb5e77420cced2ea633d911bacc0208423e720
2019-09-24Import translations. DO NOT MERGEb_141248619Bill Yi
Change-Id: Ia674d6df39bfa575ec58687303436df55ba94a3e Auto-generated-cl: translation import
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 910a292f86 -s ours am: 3a01ba25fd -s ours am: abeb36048b -s ours am skip reason: change_id Ia7ae30503ccd3358851e80258a450f8cd8030f52 with SHA1 59f15e90b8 is in history Change-Id: Iecf744b08b37bf5129d1acd9a678ef3eda7de6c1
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 910a292f86 -s ours am: 3a01ba25fd -s ours am skip reason: change_id Ia7ae30503ccd3358851e80258a450f8cd8030f52 with SHA1 59f15e90b8 is in history Change-Id: I12b7ca674fdcbc32a463bd725fbde741bd201bd8
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 910a292f86 -s ours am skip reason: change_id Ia7ae30503ccd3358851e80258a450f8cd8030f52 with SHA1 59f15e90b8 is in history Change-Id: I435b81301560513c2c923383fd20071a815de271
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I57f47240e9bbe0d9d72cbf28480370a4402e10ec Merged-In: Ia7ae30503ccd3358851e80258a450f8cd8030f52
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
660098da41 -s ours am: 1aca46cb15 am: 4846208c71 am: 59b02d3655 -s ours am skip reason: subject contains skip directive Change-Id: I76ec4a76c14d00474605a68e49a8c03f4e316877
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
660098da41 -s ours am: 1aca46cb15 am: 4846208c71 Change-Id: I3047e0fe7a90050fa7fb977a99e3fbb9b7ac667e
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
660098da41 -s ours am: 1aca46cb15 Change-Id: I41ca6a9927a861547ad1d30a4dc97113536cfad8
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 660098da41 -s ours am skip reason: subject contains skip directive Change-Id: Idaeca01629920aab43c687fc697206a835d35590
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: Ia7ae30503ccd3358851e80258a450f8cd8030f52
2019-07-09[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master" am: 73fccfbcb0 -s ours am: f6aebcb55c -s ours am: f26df65abc am: 250c9f05ad -s ours am skip reason: subject contains skip directive Change-Id: I4e097a781e7654b99b3d48bbc14ac4e6e0a0adab
2019-07-09[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master" am: 73fccfbcb0 -s ours am: f6aebcb55c -s ours am: f26df65abc Change-Id: I7ecdec2f5d4b645a269f22e11b7cceb19c7e522b
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: f5d0f0e14d -s ours am: 3d5bcda923 -s ours am: 62ee942a1b am: b008f986ca -s ours am skip reason: subject contains skip directive Change-Id: Iafcc0ed8e7b858482f44e90818c38d06dd975f1d
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: f5d0f0e14d -s ours am: 3d5bcda923 -s ours am: 62ee942a1b Change-Id: I30fb1a3413c8b897dc8f7ca10bd11d2395e8f708
2019-07-09[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master" am: 73fccfbcb0 -s ours am: f6aebcb55c -s ours am skip reason: subject contains skip directive Change-Id: I4bee18f793b577d0c9b18cf01393987ea51554bc
2019-07-09[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵temp_140451723Xin Li
(PPRL.190705.004) into master" am: 73fccfbcb0 -s ours am skip reason: subject contains skip directive Change-Id: I0996f7d8791eaa70dee29eaf1ce11b104e2b0c39
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: f5d0f0e14d -s ours am: 3d5bcda923 -s ours am skip reason: subject contains skip directive Change-Id: I9a2dbca1afd7f762f51eb9d2319ac92a70ea54e7
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: f5d0f0e14d -s ours am skip reason: subject contains skip directive Change-Id: If48de52c8508d652f56bec9ab4de87544e22a727
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 23:24:05 +0000