summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-01-28Merge "Fix license and license text."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-01-27Fix license and license text.Bob Badour
2021-10-08[automerger skipped] Merge "Merge Android 12" am: ee28c23464 -s ours am: d0c7...Xin Li
2021-10-08[automerger skipped] Merge "Merge Android 12" am: ee28c23464 -s ours am: d0c7...Xin Li
2021-10-08[automerger skipped] Merge "Merge Android 12" am: ee28c23464 -s oursXin Li
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
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ed35f1...Xin Li
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ed35f1...Xin Li
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision" am: 2353804c...android-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-devBob Badour
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision" am: 2353804c...Bob Badour
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision" am: 2353804c54android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/ProvisionBob Badour
2020-11-23Changed Provision app so it can trigger device owner provisioningFelipe Leme
2020-05-20Merge "Add an exported flag in manifest" am: 4a3dd98a05 am: b4bc0db4fc am: e9...Treehugger Robot
2020-05-20Merge "Add an exported flag in manifest" am: 4a3dd98a05 am: b4bc0db4fc am: e9...android-s-preview-1Treehugger Robot
2020-05-20Merge "Add an exported flag in manifest" am: 4a3dd98a05 am: b4bc0db4fc am: e9...Treehugger Robot
2020-05-20Merge "Add an exported flag in manifest" am: 4a3dd98a05 am: b4bc0db4fcTreehugger Robot
2020-05-20Merge "Add an exported flag in manifest" am: 4a3dd98a05android-r-beta-3android-r-beta-2Treehugger Robot
2020-05-20Merge "Add an exported flag in manifest"Treehugger Robot
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from apps/Provision" am: 02e5ae4843 am: ...Treehugger Robot
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from apps/Provision" am: 02e5ae4843 am: ...Treehugger Robot
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from apps/Provision" am: 02e5ae4843 am: ...Treehugger Robot
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from apps/Provision" am: 02e5ae4843 am: ...Treehugger Robot
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from apps/Provision" am: 02e5ae4843Treehugger Robot
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from apps/Provision"Treehugger Robot
2020-04-27Remove MODULE_LICENSE_APACHE2 from apps/ProvisionBob Badour
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
2020-03-23Add an exported flag in manifestAshwini Oruganti
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
2020-01-17[automerger skipped] Merge "Merge "Move the app to /system_ext" am: 24df85c79...r_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
2020-01-17[automerger skipped] Merge "Move the app to /system_ext" am: 24df85c79c am: c...Automerger Merge Worker
2020-01-17[automerger skipped] Merge "Move the app to /system_ext" am: 24df85c79c am: 8...Automerger Merge Worker
2020-01-17[automerger skipped] Merge "Merge "Move the app to /system_ext" am: 24df85c79...Automerger Merge Worker
2020-01-17[automerger skipped] Merge "Move the app to /system_ext" am: 24df85c79c am: c...Automerger Merge Worker
2020-01-17Merge "Move the app to /system_ext" am: 24df85c79c am: 87d6123923Automerger Merge Worker
2020-01-17Merge "Merge "Move the app to /system_ext" am: 24df85c79c" into stage-aosp-ma...android-r-preview-4android-r-preview-3android-r-preview-2Android Build Merger (Role)
2020-01-17Merge "Move the app to /system_ext"Jeongik Cha
2020-01-17Merge "Move the app to /system_ext" am: 24df85c79cAutomerger Merge Worker