summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-13Merge "Snap for 11211409 from 76bb3087f8717e7cdc91041f229e4ce6f41f7d7a to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-12-13Snap for 11211409 from 76bb3087f8717e7cdc91041f229e4ce6f41f7d7a to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Idf294ab4b01a8e354ea1e20f9207afebed85320a
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-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Ibc2ad5e4610da4617d3a9bac07bb985eb0785fdb Change-Id: I6c53f585e7b4a3a04f71309b1cee37d58d419a60
2023-10-11Merge "Snap for 10929834 from a525debcb0fe489f9ce070fd59fcbb41dc0f7ee9 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-10Snap for 10929834 from a525debcb0fe489f9ce070fd59fcbb41dc0f7ee9 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I141a5fda0794eaedb251c43dc54e3bbe71c41bdf
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-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 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: Ia88124927025e03b7a11ccad6dbf76ce019144a7 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>
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
476486ee99 -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: Ie042e452c1780495af68659f584e8b0839f1d241 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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24917269 Change-Id: I196c3ebb50896f98447c323d5ff8251641d8e11a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-01Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia2f37f415181238004abc89cf224e7a2a0b0a91f
2023-10-01Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1338629b4f464e3e1d68ebf2f89056e21f3c656b
2023-09-29[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
73dc025374 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24902795 Change-Id: I01f5a4004e0a8a6200262d0bae4a3330633d3566 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6745e6b2f55c1d2028da9076f53c447a676b4695
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
13d9e232be -s ours am: 0b2a7a7a3b -s ours am: 81e01c5424 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24608347 Change-Id: Id844f06765623dbfcb4dd44ed0b9338f10d724f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
13d9e232be -s ours am: 0b2a7a7a3b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24608347 Change-Id: Ibf2948bdd076f0d641f44f9df9f6ae833889db29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
13d9e232be -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24608347 Change-Id: I9dffe6866ea10c6d8efeb178ea9a01f711b0042a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30Import translations. DO NOT MERGE ANYWHEREtmp_amf_298295554Bill Yi
Auto-generated-cl: translation import Change-Id: I32a7e6a58537ad59bff8882f581dd01574fc737d
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 9a247936b5 -s ours ↵Xin Li
am: ca41259dae -s ours am: 999df607fe -s ours am skip reason: Merged-In I1c72e5ede24439b1471974bc32a9796a5e42878a with SHA-1 1242f7d4ee is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24181979 Change-Id: I73011d59480a6ca8dcc22e32594abd7ae8cb7aa0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 9a247936b5 -s ours ↵Xin Li
am: ca41259dae -s ours am skip reason: Merged-In I1c72e5ede24439b1471974bc32a9796a5e42878a with SHA-1 1242f7d4ee is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24181979 Change-Id: I0514fbf051f45058bae7c36234b3b0fd0082a83f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 9a247936b5 -s oursXin Li
am skip reason: Merged-In I1c72e5ede24439b1471974bc32a9796a5e42878a with SHA-1 1242f7d4ee is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24181979 Change-Id: I1b28f59aef4a1f38d41338bdfd189bcf5815e1f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I1c72e5ede24439b1471974bc32a9796a5e42878a Change-Id: I9c9cbcac2465b1b7127ceb7698e262fd5559ae5a
2023-06-28Merge "Snap for 10399941 from 8a827d52961f590455ee2ae6403cbf37ddc61044 to ↵platform-tools-34.0.5platform-tools-34.0.4Android Build Coastguard Worker
sdk-release" into sdk-release
2023-06-28Snap for 10399941 from 8a827d52961f590455ee2ae6403cbf37ddc61044 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I45accf94732e4953ace2435f9cc30d282c29c898
2023-06-17[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
udc-d1-dev am: b766a34453 -s ours am: f13b55ad37 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/23663724 Change-Id: Id4084f5fe7b3261a8746654fcee32df675d019ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
00e3a0b951 -s ours am: 19a21d981d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/23663724 Change-Id: I33763bd6e336792fcf5edd21a1a0839f188bd7c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
udc-d1-dev am: b766a34453 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/23663724 Change-Id: I1b1ebe174ee077147e1544b1497d5063f549b5d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
00e3a0b951 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/23663724 Change-Id: I442fe7bbf55237f2e51be33934b0e41ee13c3588 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-07-01 14:38:26 +0000