Commit graph

11458 commits

Author SHA1 Message Date
Bill Yi
0b2885ee7f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3cd832292f 2p: 88e83cd65e am: c47735e27e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974576

Change-Id: Id98b9dd1d6eabadecbdda96508f8ccdad9477149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 20:01:03 +00:00
Bill Yi
885c59e5fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cd832292f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974576

Change-Id: Iebe5d0bf45cd1886540b1e7b24d48787219d4a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:59:32 +00:00
Bill Yi
c4d56f92a4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ed227bcb35 am: 5df5f9b476 -s ours am: da99dd5a86 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974437

Change-Id: I067006d0929366cab4231fb16dc4d5322405f8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:38:20 +00:00
Treehugger Robot
bbf78479e3 Merge changes from topic "tc_change_23050307_33" into udc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3cd832292f 2p: 88e83cd65e
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3cd832292f
  Import translations. DO NOT MERGE ANYWHERE
2023-05-03 19:29:14 +00:00
Bill Yi
5fe3ef814b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ed227bcb35 am: 5df5f9b476 -s ours am: e0d7707f29 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974437

Change-Id: Ia361eb40cdada15e204f201f2ade1877c77527e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:16:27 +00:00
Bill Yi
c2fa201803 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ed227bcb35 am: 5df5f9b476 -s ours am: da99dd5a86 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974437

Change-Id: I538f6d50fa5f2593f3ce6171998921223addc8b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:12:20 +00:00
Bill Yi
e0d7707f29 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ed227bcb35 am: 5df5f9b476 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974437

Change-Id: Ia7c74ec4293d8630b77ff2a13c6885c327c503a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:49:31 +00:00
Bill Yi
da99dd5a86 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ed227bcb35 am: 5df5f9b476 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974437

Change-Id: Iaa1a41c62e439609a2fc164df6205fd9b56959eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:48:33 +00:00
Bill Yi
c47735e27e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3cd832292f 2p: 88e83cd65e
Blank merge reason: parent was merged -s ours

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974576

Change-Id: I5b0062d05bab581f40606f1bb4c1019a16f97205
2023-05-03 14:36:53 +00:00
Bill Yi
88e83cd65e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3cd832292f
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974576

Change-Id: I3b09ae21b11238a7307501f6260e2b3b20f474de
2023-05-03 14:36:11 +00:00
Bill Yi
5df5f9b476 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ed227bcb35
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22974437

Change-Id: I80322b3043af3e8976946bbc1162a63c362eda4f
2023-05-03 14:32:49 +00:00
Bill Yi
0a531a2c0a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iadf16f1d432cd97db16c96670dc3f8f76546f194
2023-05-02 12:48:08 -07:00
Bill Yi
f09302bbe3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifb5ef7073e625fa0d5e906882b817a920502d191
2023-05-02 12:47:28 -07:00
Bill Yi
3cd832292f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1f0bc089d0c13869b9b5c668479e2519601f21e4
2023-05-02 12:10:28 -07:00
Bill Yi
def2eb95fd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibf4276a8552667b133a15d8fadb457a4c65123f9
2023-05-02 12:09:33 -07:00
Bill Yi
ed227bcb35 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I560f8295e116fb6e6931c7ee874c45e392b6bdac
2023-05-02 12:08:40 -07:00
Automerger Merge Worker
3ec1c2e531 Merge changes from topic "am-c0be0e080b15444ab222d4ee931ea859" into udc-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a28ad2d64b -s ours am: 6c5c6ba115 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5979ea4f3 -s ours am: 7aa5f2629e -s ours
2023-04-25 08:28:52 +00:00
Treehugger Robot
d4c797b597 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a28ad2d64b -s ours am: 6c5c6ba115 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797377

Change-Id: Ic02a17d2c92f2a0132f9f53230a2a174de69529a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 08:24:19 +00:00
Bill Yi
000932053e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5979ea4f3 -s ours am: 7aa5f2629e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797377

Change-Id: I0adf9bd51f583b477715757473fa980730497da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 08:24:16 +00:00
Treehugger Robot
9cad6e6d8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a28ad2d64b -s ours am: cc816d5a88 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797377

Change-Id: Ied482f81b14d31ffe9bc66c1c641c5b0fbc2df90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 08:24:07 +00:00
Bill Yi
9efdf41f06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5979ea4f3 -s ours am: e559e7da43 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797377

Change-Id: I7d6d14428556dc1c03469ee5f41f427e96e9a846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 08:24:04 +00:00
Treehugger Robot
6c5c6ba115 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a28ad2d64b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797377

Change-Id: I854767965cd4e0f55d958b945d9a981a89603735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 07:30:10 +00:00
Bill Yi
7aa5f2629e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5979ea4f3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797377

Change-Id: Ie60a1507e14d92cb0e529062dadc8b0134c77f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 07:30:04 +00:00
Treehugger Robot
cc816d5a88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a28ad2d64b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797377

Change-Id: I2054903e554078efd728e695e216e4fb66aac0bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 07:23:46 +00:00
Bill Yi
e559e7da43 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5979ea4f3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797377

Change-Id: Ic1724562518643b0782e0f4d92b0772d1ddd2efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 07:23:43 +00:00
Treehugger Robot
a28ad2d64b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-25 06:44:18 +00:00
Bill Yi
5069b741ad [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c031e11c89 am: fe80421703 -s ours am: 94ef5b8312 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797376

Change-Id: I4fea87306db6469e8283b757960ff7692a6dbb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 03:46:10 +00:00
Bill Yi
392491a730 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c031e11c89 am: fe80421703 -s ours am: 67afb0503b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797376

Change-Id: Id0a8e9e74f24d7955203e5690a8d5f8f9faea3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:30:22 +00:00
Bill Yi
94ef5b8312 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c031e11c89 am: fe80421703 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797376

Change-Id: I772f3769c230edd3ee7d5e8cee7828406b86388e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:27:19 +00:00
Bill Yi
67afb0503b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c031e11c89 am: fe80421703 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797376

Change-Id: I6e77770812ceb77c1ef52a201892792162a91845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:20:05 +00:00
Treehugger Robot
02a1065e94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 44442d388c -s ours am: 8185533adb -s ours am: 13f03c8e0c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22801356

Change-Id: Ia56648feba568d7ca03be713893bb250cd1f2c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:32:58 +00:00
Bill Yi
714f117a7e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3857521cc5 -s ours am: e67e9546bb -s ours am: 9d29d579a1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22801356

Change-Id: I60a6d5690e6dd40e0b8753562274d912e7d00322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:32:55 +00:00
Bill Yi
d2c9d26550 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2811e4909 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22798368

Change-Id: I96cbd7bc5841a4ce1dcabc99b76b7c860810be12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:10:28 +00:00
Treehugger Robot
13f03c8e0c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 44442d388c -s ours am: 8185533adb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22801356

Change-Id: I6730808ba786a9f1e18d81a9a97b5ecf10e1feb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:40:50 +00:00
Bill Yi
9d29d579a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3857521cc5 -s ours am: e67e9546bb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22801356

Change-Id: Ia5897131f06b4cc7458ad13d271c3b6b22554b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:40:49 +00:00
Treehugger Robot
8185533adb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 44442d388c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22801356

Change-Id: Ia27c0f1915b4e058afff86a04df41744a8b4cfef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 21:50:55 +00:00
Bill Yi
e67e9546bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3857521cc5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22801356

Change-Id: I40f633eeed3266f464e1db439f28e388136804aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 21:50:53 +00:00
Treehugger Robot
44442d388c Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-04-24 21:17:15 +00:00
Steven Moreland
4a3a7ef0c6 Merge "Explicit init .rc user." am: 0e8d497ee1 am: ae8c829600 am: ed89f14ff3 am: 042166e986
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2536854

Change-Id: I8a31ed471989cbbc3c9bc6bd8ed6b5b786b2e531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 19:59:14 +00:00
Steven Moreland
042166e986 Merge "Explicit init .rc user." am: 0e8d497ee1 am: ae8c829600 am: ed89f14ff3
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2536854

Change-Id: Ic6c0325a0cc969536a26b0ab0eb8bdd809f08993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 19:35:58 +00:00
Steven Moreland
ed89f14ff3 Merge "Explicit init .rc user." am: 0e8d497ee1 am: ae8c829600
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2536854

Change-Id: Ia6790ab1f0daa843fd4ca35f3077475d8b429886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 18:50:01 +00:00
Steven Moreland
ae8c829600 Merge "Explicit init .rc user." am: 0e8d497ee1
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2536854

Change-Id: I5f65abeb8fd5139516e6870053f5a027d7ebe8a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 18:28:31 +00:00
Steven Moreland
0e8d497ee1 Merge "Explicit init .rc user." 2023-04-24 18:19:00 +00:00
Bill Yi
fe80421703 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c031e11c89
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22797376

Change-Id: I6feb93bf4c8620f2aa0b78ba232e3a97cd0d7239
2023-04-22 14:07:35 +00:00
Bill Yi
3857521cc5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1a311c04f27090927dc67692c3fcfc076c58ca6d
2023-04-21 23:29:06 -07:00
Bill Yi
a2811e4909 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I31a0d8b07ddae074b57d249ff49fac86b3d3ee42
2023-04-21 19:14:31 -07:00
Bill Yi
f5979ea4f3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I501f35c9ef807578da0450c5dd4a404708fcb558
2023-04-21 16:47:32 -07:00
Bill Yi
c031e11c89 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4eec9c5ad7fdd6ca416ed42dc51db449bc4886c2
2023-04-21 16:46:45 -07:00
Xin Li
e640c58732 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 76dff2b45b -s ours am: 1efb8613ef -s ours am: 442fd1e95a -s ours
am skip reason: Merged-In I14709252f2cd771891cfacbbba7ce4372c78efa9 with SHA-1 36956e3bb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22725844

Change-Id: I7d7aac2d711095643d2a1ed6a7b09866f41b2a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:11:48 +00:00
Xin Li
442fd1e95a [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 76dff2b45b -s ours am: 1efb8613ef -s ours
am skip reason: Merged-In I14709252f2cd771891cfacbbba7ce4372c78efa9 with SHA-1 36956e3bb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22725844

Change-Id: I9539d29a088be7629600438f2084f533bd837877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:34:02 +00:00