summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-12Snap for 11206181 from b0fda6f746bacc196acb4a321e2105ecf3850012 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I493d5b76230530edd8f18634aaef4f9161e2f269
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 76bb3087f8 ↵Xin Li
-s ours am: 16a8e2e97f -s ours am: d205c1e070 -s ours am skip reason: Merged-In I6c53f585e7b4a3a04f71309b1cee37d58d419a60 with SHA-1 602a7a7c8c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2866435 Change-Id: I4d22250b5a1bbf415adbe0bbd2c044eca0dda199 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 75077ec6a4 -s ours am: ↵Xin Li
dbde620281 -s ours am: 8e5f09795b -s ours am skip reason: Merged-In I6c53f585e7b4a3a04f71309b1cee37d58d419a60 with SHA-1 602a7a7c8c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2866435 Change-Id: Iba07b90d25ff2a91f1cf2378e8c5279223fc601b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 76bb3087f8 ↵Xin Li
-s ours am: 16a8e2e97f -s ours am skip reason: Merged-In I6c53f585e7b4a3a04f71309b1cee37d58d419a60 with SHA-1 602a7a7c8c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2866435 Change-Id: Ic2dd894fd2f79d52df3906f0a7af3dc885f7f265 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 75077ec6a4 -s ours am: ↵Xin Li
dbde620281 -s ours am skip reason: Merged-In I6c53f585e7b4a3a04f71309b1cee37d58d419a60 with SHA-1 602a7a7c8c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2866435 Change-Id: Ic56e9a255467a17c077333a8f4c85e09acf4ae6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 76bb3087f8 ↵Xin Li
-s ours am skip reason: Merged-In I6c53f585e7b4a3a04f71309b1cee37d58d419a60 with SHA-1 602a7a7c8c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2866435 Change-Id: Ic659f1840af8a29f868ecbaa7ca221c696c9bf85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 75077ec6a4 -s oursXin Li
am skip reason: Merged-In I6c53f585e7b4a3a04f71309b1cee37d58d419a60 with SHA-1 602a7a7c8c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2866435 Change-Id: If5feeead0faf7cab91d1b2cd2494df6101d95b0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09Merge "Merge Android 14 QPR1" into mainXin Li
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I6c53f585e7b4a3a04f71309b1cee37d58d419a60 Bug: 315507370 Change-Id: Ia36320a137926a6cb6bf3e95c5a95e646859bc88
2023-10-21Snap for 10985023 from e931a23665a2a100e124e6aa566dd8aed591ff11 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ic4b916ae1e766f64bbfb102d2b48692e6b6fa0d7
2023-10-19[automerger skipped] Merge 10952656 am: 602a7a7c8c -s ours am: 75033afb7a -s ↵Xin Li
ours am skip reason: Merged-In Ibc2ad5e4610da4617d3a9bac07bb985eb0785fdb with SHA-1 9065b5b82c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/25090167 Change-Id: I102b8a922eb94d28f9d708de8c3bf614b46c0e0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: 602a7a7c8c -s oursXin Li
am skip reason: Merged-In Ibc2ad5e4610da4617d3a9bac07bb985eb0785fdb with SHA-1 9065b5b82c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/25090167 Change-Id: I705ad7e704e6a7532bdcf420d4bee6129a2886ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Ibc2ad5e4610da4617d3a9bac07bb985eb0785fdb Change-Id: I6c53f585e7b4a3a04f71309b1cee37d58d419a60
2023-10-07Snap for 10917888 from 14668b521d462da7e4a7fb931f4d929f42d33dee to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I503c22efa65df0be079bb9c73b7a1a025535a211
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: a525debcb0 -s ↵Xin Li
ours am: ef11e700f7 -s ours am: bd16e5d2e5 -s ours am: 4db193f925 -s ours am: 9065b5b82c -s ours am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: Ida1f6368af915890dcc55fef0f40fbd83d04bb8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 5a52c96b7c -s ours am: e3b1909709 ↵Xin Li
-s ours am: 528957be94 -s ours am: bbdb71dc93 -s ours am: f849e11221 -s ours am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: Iad75c9502f37bddb0e8ae5550e3e24a116150441 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: a525debcb0 -s ↵Xin Li
ours am: ef11e700f7 -s ours am: bd16e5d2e5 -s ours am: 4db193f925 -s ours am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: Ibc2ad5e4610da4617d3a9bac07bb985eb0785fdb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 5a52c96b7c -s ours am: e3b1909709 ↵Xin Li
-s ours am: 528957be94 -s ours am: bbdb71dc93 -s ours am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: I5bff26ba34ff17050a9037f6baa4f913b3145c08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: a525debcb0 -s ↵Xin Li
ours am: ef11e700f7 -s ours am: bd16e5d2e5 -s ours am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: Iaf4add1f6009e1696611133bd249157de5ee0e18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 5a52c96b7c -s ours am: e3b1909709 ↵Xin Li
-s ours am: 528957be94 -s ours am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: Ia19b377091f5b7554f53b6f6fc2cc3c957dfc357 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: a525debcb0 -s ↵Xin Li
ours am: ef11e700f7 -s ours am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: I9035377a7636ed0782e49a441883aff9f7277193 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 5a52c96b7c -s ours am: e3b1909709 ↵Xin Li
-s ours am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: Ib82e7d5208c0529bf585378903cc58755989c0fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: a525debcb0 -s oursXin Li
am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: I20bc705a690401512a8ca57ac991f053257d8876 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 5a52c96b7c -s oursXin Li
am skip reason: Merged-In I32a7e6a58537ad59bff8882f581dd01574fc737d with SHA-1 13d9e232be is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2776745 Change-Id: Ia157196fffec5451f2a6028dc94bfa60a2d97993 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I32a7e6a58537ad59bff8882f581dd01574fc737d Change-Id: I7c2dba6225bb7daa0d1b15b0cd010d94682d0b43
2023-10-04Snap for 10897809 from 08879627cdc5f1b7b59d29d10ed5acccceeb87ee to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I0c5cf44e70c28b7a455f03da3423c477fafe5f47
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
1d3da1daf1 -s ours am: c01e675480 -s ours am: 784b8e9299 -s ours" into udc-qpr-dev-plus-aosp am: 32c29799ad -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: If473f8d39dd55add2277abd86f47b9055c3e6f98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: c01e675480 -s ours am: 784b8e9299 -s ours am: fcb53a36a7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: Ia2ae43bf280d3b381ee63caa9dc3410c7b5b1a27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
1d3da1daf1 -s ours am: c01e675480 -s ours" into udc-d1-dev-plus-aosp am: a5e21c4495 -s ours am: 4490ef7479 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: I68df22c9ea09cd6d52a2e7913cc2e2d27b8037c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: c01e675480 -s ours am: 2ef4c91327 -s ours am: 233664fcfb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: I698c8cdfe92a39a1e53bf647672f1d1cf8555aad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: 19ea9b7e94 -s ours am: 95b9ac2d77 -s ours am: d76ddcd5bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: I41b3d6e698ee061a95fff6e4bc11ad27c878af3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
1d3da1daf1 -s ours am: c01e675480 -s ours am: 784b8e9299 -s ours" into udc-qpr-dev-plus-aosp
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
1d3da1daf1 -s ours am: c01e675480 -s ours" into udc-d1-dev-plus-aosp am: a5e21c4495 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: I98127b1b3db6f12e5a22d92f7016aec16cff8d8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: c01e675480 -s ours am: 2ef4c91327 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: I7f42ddeeefc0821f7fb27e7b77897948be9c819c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: c01e675480 -s ours am: 784b8e9299 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: I67aa5c192133a4786344052eb2bd8061cc90423e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: 19ea9b7e94 -s ours am: 95b9ac2d77 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: Idc07a05449a83f36ee7d5cf756f1c2fe106b3dab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
1d3da1daf1 -s ours am: c01e675480 -s ours" into udc-d1-dev-plus-aosp
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: c01e675480 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: Ia87b4cc862c9564bb1c1f38704e608fa0532fed9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: 19ea9b7e94 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: Ib2aa74581abb838ea6f07ee39e2133e22458064a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: c01e675480 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: I377a37694ea75dff870a0b6883086a4c02f78216 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am: 1818949364 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: Ifbee63b016c4c6cc80606e768204ae9f3d01b741 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: I0a3e4f4c020ae6cca8a5721fe07b3d728cb88e51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: Id189dbaf94d37e40a7fc57bd6364e48e3d90bdb2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1d3da1daf1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24916835 Change-Id: Ia88124927025e03b7a11ccad6dbf76ce019144a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "Import translations. DO NOT MERGE ANYWHERE" into mainBill Yi
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
476486ee99 -s ours am: d0ad9886cf -s ours am: b84ced5766 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24917269 Change-Id: If411f52973dcb4017189eeb7f880d47210c8820f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
476486ee99 -s ours am: 023b393eb4 -s ours am: 907c4a5a60 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24917269 Change-Id: I5523eb46afecddd3647d51d619bbb54693f20dac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
476486ee99 -s ours am: d0ad9886cf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24917269 Change-Id: Ib2ef7ee2fb83e9ae417107ea9ee78eedcd2031a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
476486ee99 -s ours am: 023b393eb4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24917269 Change-Id: I30ff48db62ade81ec7cf246cd02a326f279ed914 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 01:47:28 +0000