Automerger Merge Worker
9d0053aa94
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours am: 4f699295cb
-s ours" into udc-d1-dev-plus-aosp am: e7858557cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: I2dead07ea817dffc35c0409d5d63047260e6a404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:50:07 +00:00
Bill Yi
864f03b7cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours am: 4f699295cb
-s ours am: 0a844f2026
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: Ife411cfad1f870e34e4f7ac679462c1f4089e657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:49:57 +00:00
Bill Yi
42f1e0d046
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6656944ffd
-s ours am: 56589b6a02
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213243
Change-Id: I75b5c0daf8875997be96caf9b76e01dfb1c6e3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:39:20 +00:00
Bill Yi
68c4e6926d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours am: df511932da
-s ours am: 140fc52640
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: Iae4d59320240b75ce6ad2d98a0d3a62655b64847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:38:57 +00:00
Bill Yi
c840b877c6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37
-s ours am: 6065832835
-s ours am: bb84907f83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212910
Change-Id: I2f81344ac658a890fc34911e9f80a67ee7661a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:33:10 +00:00
Bill Yi
21801d40e1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37
-s ours am: 6065832835
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212910
Change-Id: I3aa6c5cfd9610a1b3a773edf2887bcec68b0b867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:28:01 +00:00
Bill Yi
0e2dec3aa3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours am: 4f699295cb
-s ours am: 0779890e66
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: I8d86fabe4655f52ada6774c05e4a443c738334e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:22:57 +00:00
Bill Yi
a812823256
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37
-s ours am: 6065832835
-s ours am: 370aea0cc3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212910
Change-Id: Ie2930ba0bd843ab8d75d7f2123fd0f4b511f294f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:11:43 +00:00
Bill Yi
bb84907f83
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37
-s ours am: 6065832835
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212910
Change-Id: I12aa45f8fa081daf6fdea4419df7e999155bfc62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:09:51 +00:00
Bill Yi
370aea0cc3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37
-s ours am: 6065832835
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212910
Change-Id: Iecc3a266a090ae9c1671f158e3e531e794362086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:09:35 +00:00
Bill Yi
56589b6a02
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6656944ffd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213243
Change-Id: Ie2e28ecccbc0f6df7ca4dd25e80f86dd607193ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:06:56 +00:00
Bill Yi
6065832835
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212910
Change-Id: I9f981bcdccf0702b08e3068964b099f1aa6f2c05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:06:43 +00:00
Automerger Merge Worker
e7858557cf
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours am: 4f699295cb
-s ours" into udc-d1-dev-plus-aosp
2023-07-27 20:55:10 +00:00
Bill Yi
0779890e66
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours am: 4f699295cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: Idc7e0c1617bbe6bc50b88664126b7c760c8bd905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:50:12 +00:00
Bill Yi
0a844f2026
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours am: 4f699295cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: Ia3a6c9fb1c5519c16a849324a5241aa8c3ad918d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:49:34 +00:00
Bill Yi
140fc52640
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours am: df511932da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: Iefea2ba60ac22266761099dd8a8fdf2882623680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:47:42 +00:00
Bill Yi
4ca1b258b7
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-07-27 20:41:13 +00:00
Bill Yi
9f2b95b024
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours am: 66cd74b16e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: I7a96e1c4cbf661fdcab2c8fa0a13a3f523b537ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:26:30 +00:00
Bill Yi
df511932da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: I53d618c0ffef5ef7b65b1be9300310ee31e4cc8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:20:02 +00:00
Bill Yi
66cd74b16e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: Ifea89bb521bb5e3f8cd1160fa9116e0e2fbe9a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:18:15 +00:00
Bill Yi
4f699295cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: I7cb03dc2bcbaab27eed3e2197719e974cbe704ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:17:37 +00:00
Bill Yi
a5a9f8010c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95a40c4f8e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24210042
Change-Id: I071b7329543dc22ffe052f587d8f8b84245089fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:05:03 +00:00
Bill Yi
686da02c37
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic59d43a5d1d0d099ea932f7349538f0bd5be6ae6
2023-07-26 10:47:16 -07:00
Bill Yi
fc8ec87f31
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaea9e9e243ded57c55189ac6b094ce4951efe3d3
2023-07-26 10:45:53 -07:00
Bill Yi
6c8fb3fe72
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b3bd66d3eb8a2879e8dcb118c0b18584e06eca8
2023-07-26 10:45:15 -07:00
Bill Yi
6656944ffd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5505ada2fda4654eeddd634a1c65e32b275d564e
2023-07-26 10:33:39 -07:00
Bill Yi
cc953e3224
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8aad2264735f3204f851c981f81f712336a5bbca
2023-07-26 10:32:41 -07:00
Bill Yi
95a40c4f8e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaa26a35b30128f6c79761df8f140dbc2dc222639
2023-07-26 10:31:44 -07:00
Florian Mayer
a7080f0a24
[automerger skipped] Merge "Add flag whether MTE state was forced" into udc-qpr-dev am: e03eed2c20
-s ours am: 785dcd3da5
-s ours
...
am skip reason: Merged-In I6178f0b88b718e96e5c8ee39113848f422e5fb6d with SHA-1 9ff5549670
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24121848
Change-Id: I5e8fe182eb21a9170513a5c917a2a2cb53614c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:48:11 +00:00
Florian Mayer
7cf5730f28
[automerger skipped] Add flag whether MTE state was forced am: c4556af552
-s ours am: f87bbd8a86
-s ours
...
am skip reason: Merged-In I6178f0b88b718e96e5c8ee39113848f422e5fb6d with SHA-1 9ff5549670
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24121848
Change-Id: Ia53c9be848e58f955261041b570d762d175677e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:48:08 +00:00
Florian Mayer
785dcd3da5
[automerger skipped] Merge "Add flag whether MTE state was forced" into udc-qpr-dev am: e03eed2c20
-s ours
...
am skip reason: Merged-In I6178f0b88b718e96e5c8ee39113848f422e5fb6d with SHA-1 9ff5549670
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24121848
Change-Id: I672e0251169f0d59e56cf580bd6e8854e34f0be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:36:05 +00:00
Florian Mayer
f87bbd8a86
[automerger skipped] Add flag whether MTE state was forced am: c4556af552
-s ours
...
am skip reason: Merged-In I6178f0b88b718e96e5c8ee39113848f422e5fb6d with SHA-1 9ff5549670
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24121848
Change-Id: Ice4e1f4e4df69d7ee26edd20a300527ca8ad2e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:36:03 +00:00
Florian Mayer
e03eed2c20
Merge "Add flag whether MTE state was forced" into udc-qpr-dev
2023-07-25 19:43:59 +00:00
Automerger Merge Worker
c73a50d988
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: e8813b9c9d
-s ours" into udc-qpr-dev-plus-aosp am: 47f4c709b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I48e5bbb7a425cae6a27745d6aad3d9313e42e5fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 21:50:43 +00:00
Bill Yi
59dd434333
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: e8813b9c9d
-s ours am: ebbf09c1e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: Ia1934d715e1a9c4246cef3ee5ae57890b27e60c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 21:50:32 +00:00
Bill Yi
f8fb14e507
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: 4f2efa7239
-s ours am: e87368a525
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: Ifccbe7afafe02b638cb855228bba7ef33f34692d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 21:43:11 +00:00
Automerger Merge Worker
47f4c709b2
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: e8813b9c9d
-s ours" into udc-qpr-dev-plus-aosp
2023-07-24 20:56:21 +00:00
Bill Yi
ebbf09c1e3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: e8813b9c9d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I45ea8ce805a7b0136dfc3df2e20e5b5598e0e6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 20:54:04 +00:00
Bill Yi
e87368a525
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: 4f2efa7239
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I747e804d5f3728c52bccde92ad0e58d5144a38ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 20:49:43 +00:00
Bill Yi
4f2efa7239
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I3f03194a7887200f9b4f15b18ab5cc31f3ef6330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 20:31:30 +00:00
Bill Yi
e8813b9c9d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I71da393da1ba8a50a32b4ab88680ffda67f2370d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 20:29:49 +00:00
Bill Yi
0b012dc38b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5d610aa5656deda62e108b92a71d7d98251c0bc
2023-07-24 09:07:06 -07:00
Florian Mayer
c4556af552
Add flag whether MTE state was forced
...
This will be used by mtectrl to remember whether the MTE state was
overriden using the force_on / force_off flags or set by the user. We
need that information when the force_on / force_off flag is reset.
(this is a cherry-pick of 9ff5549670
)
Bug: 291106070
Merged-In: I6178f0b88b718e96e5c8ee39113848f422e5fb6d
Change-Id: I6178f0b88b718e96e5c8ee39113848f422e5fb6d
2023-07-18 15:45:15 -07:00
Florian Mayer
e9eb668331
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
am: 90db0020b6
am: 6e222b158f
am: 435389091c
am: 01ab838c4e
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: I67e8765776d8703097012cf925521d5f2ba2623c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:49:05 +00:00
Eric Biggers
413ff3228c
Merge "update_verifier: don't pass an unused command-line argument" into main am: 9910cbf8e0
am: 5dfa62d6af
am: 9f1e980d3e
am: f02d996c9b
am: 1baa963830
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2653222
Change-Id: I90eb1d9d54cd2f5ceaf4629d83fba7c90709d87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:06:31 +00:00
Florian Mayer
01ab838c4e
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
am: 90db0020b6
am: 6e222b158f
am: 435389091c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: Icb74b19434058f1a3e7a7b7162b54448e1bfb07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 01:20:12 +00:00
Florian Mayer
435389091c
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
am: 90db0020b6
am: 6e222b158f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: Iaa37d210385e575954d8fc7afca16dd99a16e54e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 00:33:52 +00:00
Florian Mayer
6e222b158f
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
am: 90db0020b6
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: I7655f7fd17d39151b6c785c3dfbd0456f50a4b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:51:04 +00:00
Eric Biggers
1baa963830
Merge "update_verifier: don't pass an unused command-line argument" into main am: 9910cbf8e0
am: 5dfa62d6af
am: 9f1e980d3e
am: f02d996c9b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2653222
Change-Id: I2a17486f593609f8a41a4f196bb17204e6b6fd4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:05:34 +00:00
Florian Mayer
90db0020b6
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: I87bad089e42751275548a8dc0f81a73ba2e80c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:38:04 +00:00