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
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
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
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
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
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
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
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
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
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
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
Xin Li
1efb8613ef
[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 76dff2b45b
-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: I4437cd70337ad09a256b560cfbd76e7169c24abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:11 +00:00
Xin Li
76dff2b45b
Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
...
Bug: 275386652
Merged-In: I14709252f2cd771891cfacbbba7ce4372c78efa9
Change-Id: Id30afd0dfafba9d57bb32f238a98aee5cff62d91
2023-04-18 16:31:48 -07:00
Steven Moreland
98322a3775
Explicit init .rc user.
...
Set the user explicitly.
Bug: 276813155
Test: boot
Change-Id: I26ee9db2a82dc89b35e551782b6b1d942e72c8cd
2023-04-14 16:12:23 +00:00
Roy Luo
a5b62f3dbe
Merge "Configure USB gadget maximum power" am: 772939db8b
am: db04d6a1e9
am: 66f35e60a5
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2525019
Change-Id: I78454333158abe0f9f745d17a6c611472e82dd20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 09:24:36 +00:00
Roy Luo
66f35e60a5
Merge "Configure USB gadget maximum power" am: 772939db8b
am: db04d6a1e9
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2525019
Change-Id: I01d58a5b5d9f1dc54863f92420c8e014fa4d89ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 08:53:48 +00:00
Roy Luo
db04d6a1e9
Merge "Configure USB gadget maximum power" am: 772939db8b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2525019
Change-Id: I759fb17d25a36a1e118076f32d60ccd7f986852d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 08:23:59 +00:00
Roy Luo
772939db8b
Merge "Configure USB gadget maximum power"
2023-04-06 08:00:18 +00:00
Roy Luo
fe37b5ebbc
Configure USB gadget maximum power
...
The default 2mA would be applied if the field is left
unconfigured. Configure the gadget to use full power.
Test: boot to userspace fastbootd and recovery
Bug: 277022505
Change-Id: I18abd98b62f5ce8d35062debad8100d87140bdba
2023-04-06 00:27:51 +00:00
TreeHugger Robot
195b069b7a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-04 06:36:38 +00:00
Bill Yi
805207a762
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ceb7924c43
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22424666
Change-Id: I1441b2b6b95b1ce96b094a61db8c15fcfd55fea7
2023-04-03 14:34:22 +00:00
Bill Yi
737b3c4ed6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6fa10c9cade5a3de7a85e34789d13f1e6c4aad60
2023-04-02 17:26:37 -07:00
Bill Yi
ceb7924c43
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifc8e7c02c287f3e82f103e41638a7f1ae4d16d10
2023-04-02 17:26:00 -07:00
Bill Yi
5f51dd70b0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36956e3bb8
-s ours am: 875c09e85f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22391284
Change-Id: I8e2b5d13d7902a27697ab814d3411a4b795d4cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-02 04:41:04 +00:00
Bill Yi
875c09e85f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36956e3bb8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22391284
Change-Id: Icac43b64c33ba49f501225bf1250562860f810c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-02 04:25:57 +00:00
Bill Yi
36956e3bb8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I14709252f2cd771891cfacbbba7ce4372c78efa9
2023-03-31 16:46:15 -07:00
Treehugger Robot
4b0f87aed2
Merge "Add ZSTD dependency for recovery" am: d97f317e0d
am: 9a6e61051c
am: 935ccea458
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2439633
Change-Id: I802fd87c3651f64134b8ff2e02e0762f665bc925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 20:54:29 +00:00
Treehugger Robot
935ccea458
Merge "Add ZSTD dependency for recovery" am: d97f317e0d
am: 9a6e61051c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2439633
Change-Id: Ia94873c92de074dace8a8c58a176190505ce0c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 20:15:41 +00:00
Treehugger Robot
9a6e61051c
Merge "Add ZSTD dependency for recovery" am: d97f317e0d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2439633
Change-Id: I57ebdcc415bdf0a124aba447a16005f2a315f682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 19:40:33 +00:00
Treehugger Robot
d97f317e0d
Merge "Add ZSTD dependency for recovery"
2023-03-17 18:55:07 +00:00
Kelvin Zhang
04a9449c30
Add ZSTD dependency for recovery
...
In prepartion for adding ZSTD support to OTA.
Bug: 274129758
Change-Id: I036a6a21eaac2eb5b31aaec072f2eb28bbc622aa
2023-03-17 17:23:30 +00:00
Treehugger Robot
3d576c758f
Merge "Allow brick OTA package to be sideloaded in recovery" am: aff08259ec
am: 2f5744f57e
am: 2643880e5d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486129
Change-Id: Iea29567176394255efe51ca4cc59c45639d07175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 04:56:31 +00:00
Treehugger Robot
2643880e5d
Merge "Allow brick OTA package to be sideloaded in recovery" am: aff08259ec
am: 2f5744f57e
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486129
Change-Id: Ifa99533458d7a01e2a0a736ef2929f220adce9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 04:17:35 +00:00
Treehugger Robot
2f5744f57e
Merge "Allow brick OTA package to be sideloaded in recovery" am: aff08259ec
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486129
Change-Id: I14bd01d88930021d2c9f074016616daabf5ac39f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 03:41:05 +00:00