summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-16Snap for 8736029 from b3ff3e7c6178fee68ccd4b5f52d282c0eee8c4e6 to ↵aml_go_sta_330911000android13-mainline-go-os-statsd-releaseAndroid Build Coastguard Worker
mainline-go-os-statsd-release Change-Id: Ifbf3c2cc3a286d2a9d62a55e8e33d9d05befe325
2022-04-28Snap for 8505378 from 3a5346516d37d7f4fdba15918721a8453d768ce6 to ↵Android Build Coastguard Worker
mainline-go-os-statsd-release Change-Id: I2bf19e82c0707b1ff46bce1854b90faaccbdf03c
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: bf8884f84d -s ours ↵aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_art_331012050Xin Li
am: f989cc5c2f -s ours am: 3a5346516d -s ours am skip reason: Merged-In I4a26ba0779179ccbe48e0c0a49b6e6f09a6e1e9a with SHA-1 5f0659e874 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/17544972 Change-Id: I87117caebf8d197eecc2027861267cf221baaca4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: bf8884f84d -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devXin Li
am: f989cc5c2f -s ours am skip reason: Merged-In I4a26ba0779179ccbe48e0c0a49b6e6f09a6e1e9a with SHA-1 5f0659e874 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/17544972 Change-Id: If6a63a4b412a414d813408c9dc2f2a84f2ce3bdc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: bf8884f84d -s oursXin Li
am skip reason: Merged-In I4a26ba0779179ccbe48e0c0a49b6e6f09a6e1e9a with SHA-1 5f0659e874 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/17544972 Change-Id: Ie544b75669f14cc67719f4cbc67cda931951e5f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: I4a26ba0779179ccbe48e0c0a49b6e6f09a6e1e9a Change-Id: Iaecc65f00ee0ce24e4156ab120623096a0edfc58
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3aa5eded38 -s ours am: 7cc28e8c05 -s ours am: 5f0659e874 -s ours am: 87c6546ec8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2043710 Change-Id: Ibb6203703e2252cc60c63b511cff1abe1bb5a5ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3aa5eded38 -s ours am: 7cc28e8c05 -s ours am: 5f0659e874 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2043710 Change-Id: I7bc30d8db81318785e366c67c58756d3de31ed30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
16a4ffc7d7 -s ours am: 49ccd0eb1a -s ours am: b4ea9ad7cf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/17422221 Change-Id: I996ca77d24cf7de4170a0ca246a8f5b90bb13941 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3aa5eded38 -s ours am: 7cc28e8c05 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2043710 Change-Id: I4a26ba0779179ccbe48e0c0a49b6e6f09a6e1e9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
16a4ffc7d7 -s ours am: 49ccd0eb1a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/17422221 Change-Id: Icba9882b8b71c127e66e109b6971e55e187a9109 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3aa5eded38 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2043710 Change-Id: I27735e1ebd199ba9ff131b12e71f70c247e09453 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
16a4ffc7d7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/17422221 Change-Id: I5bfa02e359ac68cf99332aa7623f42cee912fd07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I8a5edde252cc928e726ff242f737e143e516abef
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie5ba0d837373d8eb84488271983f810d0a4895f3
2022-03-09[automerger skipped] Merge Android 12L am: 91630b94f8 -s ours am: 3c62d9c89c ↵Xin Li
-s ours am: da0de1fb40 -s ours am: 64b96dbb8d -s ours am skip reason: Merged-In I47fa16ad918be3c315a7af05e98da7ce91a1bf2e with SHA-1 f52f17f7a2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2013424 Change-Id: I41a224d7cf9991990b49de919a6dad16093ab98a
2022-03-09[automerger skipped] Merge Android 12L am: 91630b94f8 -s ours am: 3c62d9c89c ↵Xin Li
-s ours am: da0de1fb40 -s ours am skip reason: Merged-In I47fa16ad918be3c315a7af05e98da7ce91a1bf2e with SHA-1 f52f17f7a2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2013424 Change-Id: Ia3d6af1e8823d87d06a6a31bcba3b92dd5070a26
2022-03-08[automerger skipped] Merge Android 12L am: 91630b94f8 -s ours am: 3c62d9c89c ↵Xin Li
-s ours am skip reason: Merged-In I47fa16ad918be3c315a7af05e98da7ce91a1bf2e with SHA-1 f52f17f7a2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2013424 Change-Id: I28f63d9168d186543129aa88cd0a6bb320838d3a
2022-03-08[automerger skipped] Merge Android 12L am: 91630b94f8 -s oursXin Li
am skip reason: Merged-In I47fa16ad918be3c315a7af05e98da7ce91a1bf2e with SHA-1 f52f17f7a2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2013424 Change-Id: I1eeb6cfa42078dca697954d0bb9c4334850ba965
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I47fa16ad918be3c315a7af05e98da7ce91a1bf2e Change-Id: I4609cc23bc7003883268d12626b363c94a31b838
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
f52f17f7a2 -s ours am: be518240fa -s ours am skip reason: Merged-In I73e20e60c44cdf76fe9525036e9f58260a6b5c03 with SHA-1 5802e99977 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16845236 Change-Id: Idce8789a71af9e7f1c20c09b11fe657b9334010c
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
f52f17f7a2 -s ours am skip reason: Merged-In I73e20e60c44cdf76fe9525036e9f58260a6b5c03 with SHA-1 5802e99977 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16845236 Change-Id: Ic13d2831b0ace7dd6af6c03186651f6daf37de7e
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: I73e20e60c44cdf76fe9525036e9f58260a6b5c03 Change-Id: I47fa16ad918be3c315a7af05e98da7ce91a1bf2e
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5802e99977 -s ours am: c516827c49 -s ours am: 9b10295af0 -s ours am: 7f57798b90 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/1943282 Change-Id: I4a223294245e3727ab3bc43b0b64fe9efbb3ffb7
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ef2d86d302 -s ours am: 35681a01b9 -s ours am: 924dcdbf9b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16591755 Change-Id: Ib98c424929f250131744d47414163a410832f140
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5802e99977 -s ours am: c516827c49 -s ours am: 9b10295af0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/1943282 Change-Id: Ibd0a0250576808cd98551beb4956adcf218f06c1
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ef2d86d302 -s ours am: 35681a01b9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16591755 Change-Id: I491cd3978a8369290661295028e8b4efd1a37581
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5802e99977 -s ours am: c516827c49 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/1943282 Change-Id: I7c15bdfa3f07f4c37d7f3125e004138804f6888a
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5802e99977 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/1943282 Change-Id: I13fc6b48155c6c111c9c09841e4a758a1554fe5c
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ef2d86d302 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16591755 Change-Id: I8703e254c5a2db465aab901e820e01af7070c8d9
2022-01-10Import translations. DO NOT MERGE ANYWHEREandroid-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-1Bill Yi
Auto-generated-cl: translation import Change-Id: I73e20e60c44cdf76fe9525036e9f58260a6b5c03
2022-01-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id69d4cc1817c1a62082d7b5b5c100bda9ad8036a
2022-01-09[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-qpr1-dev am: f2b24003b3 -s ours am: 7e0d732a1c -s ours am: 4e515bd5f9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583012 Change-Id: I83bc63f7fb7618856e2ba4a1716d4b75b0860144
2022-01-09[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: e8d0cd0615 am: 8c24f69141 -s ours am: daf37b04df -s ours am: d90a37fae6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583011 Change-Id: Ifaf17bea82ae51a7c7f805cd6cfaa259b2c26a03
2022-01-09[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d4a788c79a -s ours am: a2d8874b3b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583013 Change-Id: I1caf825c913ae7cc85d968263b47c84498b129dd
2022-01-09[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-qpr1-dev am: f2b24003b3 -s ours am: 22b3ae219e -s ours am: 69c05f7209 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583012 Change-Id: Ieada63e6ae9e40263c906a035da17563abf7fffa
2022-01-09[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: e8d0cd0615 am: 8c24f69141 -s ours am: 497b859d4a -s ours am: 05270e459c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583011 Change-Id: I182b19146ba2aaab12fd25ec3d51ab44120bbf1d
2022-01-09[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-qpr1-dev am: f2b24003b3 -s ours am: 7e0d732a1c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583012 Change-Id: Iee547a89da2d2fbec1e1213a003506e4c42746cc
2022-01-09[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: e8d0cd0615 am: 8c24f69141 -s ours am: daf37b04df -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583011 Change-Id: I5a2a13e812f57ccf6487d5e9963393a38feb5b26
2022-01-09[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d4a788c79a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583013 Change-Id: I7cc71d6c4d7e000f2d8fe4505b07bf602bc2690f
2022-01-09[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-qpr1-dev am: f2b24003b3 -s ours am: 22b3ae219e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583012 Change-Id: I50e78bf811ba5bbe09632a59535388e44b9df963
2022-01-09[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: e8d0cd0615 am: 8c24f69141 -s ours am: 497b859d4a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583011 Change-Id: Id03f16927d8d01d4a193cb0f9bea84dc459a8f3e
2022-01-09[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-qpr1-dev am: f2b24003b3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583012 Change-Id: Ic38c86f7a922e640165f9ae8dfadb32f14f9e693
2022-01-09[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseTreeHugger Robot
sc-qpr1-dev am: f2b24003b3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583012 Change-Id: I9702ba37dd93224bebed3468f73bc3b43808f3c1
2022-01-09[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: e8d0cd0615 am: 8c24f69141 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583011 Change-Id: Idbf9c9dbb84da081e23d372f5b384f52dfe7e8c0
2022-01-09[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: e8d0cd0615 am: 8c24f69141 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583011 Change-Id: Ia57158efbb8f295c4700e1c1879efd4eb5a49c2b
2022-01-09Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-devTreeHugger Robot
2022-01-07Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ief033afdf3140c4a6cbb97b2be4b7914e43f8c11
2022-01-07Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ied6900db3d41d5f9d1df33512efce0d8d59b9ddd
2022-01-07[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e8d0cd0615Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16583011 Change-Id: I676811bcd362dbf354d3cb386909f05d997a71d4
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 23:00:52 +0000