tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11679 commits 1 branch 0 tags 82 MiB
Commit graph

11679 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
a57eebae81 Merge "recovery: fix UI error when directories too many [1/1]" into main 2023-10-27 09:45:00 +00:00
weifang.liu
159a5473a2 recovery: fix UI error when directories too many [1/1] 
PD#SWPL-109807
PD#SWPL-140491
BUG=296817261

Problem:
UI error when directories too many

Solution:
check if select menu exceed screen size

Verify:
ohm

Change-Id: I4905a5766985aa5b9f59cd30613f4c90c07c16ab
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
 2023-10-25 09:46:47 +08:00
Fabien Sanglard
11cc36d907 Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 am: 1e5602afcb am: c7d0321b32 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: I8f83cbdc08fc1c03736f39ceafc6eebc9d4bd22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 18:04:53 +00:00
Fabien Sanglard
52b217d4de Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 am: 43ec749931 am: 32e7fddb66 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: I1cfdfe3453b1546ed1043830781ef6269595ded6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 18:04:09 +00:00
Fabien Sanglard
c7d0321b32 Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 am: 1e5602afcb 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: I9e04695195b9d9896e772a516d3e87643bbb689f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 17:39:16 +00:00
Fabien Sanglard
32e7fddb66 Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 am: 43ec749931 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: Ic36c38a25a0bec220a129bb39d921f5ce39c8677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 17:37:09 +00:00
Fabien Sanglard
1e5602afcb Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: I43aac21d59d509127008c8969e75266287a80826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 17:19:59 +00:00
Fabien Sanglard
43ec749931 Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: I913a621a48b258c561735edd2f00ae0fffbecfe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 17:18:57 +00:00
Fabien Sanglard
8028425445 Merge "MinADB: Companion CL to deprecate tMsg" into main 2023-10-23 17:01:04 +00:00
Fabien Sanglard
4baf92fb64 MinADB: Companion CL to deprecate tMsg 
Fixes: 296247651
Test: Already covered
Change-Id: I0d300fba61f7256a82f8d48428fea8d26c83f8f3
 2023-10-20 16:09:28 -07:00
Xin Li
62329c8f60 [automerger skipped] Merge 10952656 am: cbf450e563 -s ours am: 1200b4c0a1 -s ours 
am skip reason: Merged-In I5b0c0a0f06c7b2262f644012f2c52c171df03814 with SHA-1 0f5ed6884e is already in history

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

Change-Id: Ic1f400d30cb7b1db00cecd5d4fd42d94f5c59f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 23:54:27 +00:00
Xin Li
1200b4c0a1 [automerger skipped] Merge 10952656 am: cbf450e563 -s ours 
am skip reason: Merged-In I5b0c0a0f06c7b2262f644012f2c52c171df03814 with SHA-1 0f5ed6884e is already in history

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

Change-Id: I263a2b9b807878ccc8cd3b561557c9df55143e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 18:47:41 +00:00
Xin Li
cbf450e563 Merge 10952656 
Merged-In: I5b0c0a0f06c7b2262f644012f2c52c171df03814
Change-Id: Ic199e5f8b04257f0da58b1a0060407516f9ca87f
 2023-10-17 10:05:50 -07:00
Xin Li
461dc25997 [automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5 -s ours am: 93ba033a58 -s ours am: c718f599a5 -s ours am: f4c95ddd11 -s ours am: 0f5ed6884e -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: Iadc4b0678945fefbf8946c1bac7685b179937377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:24:18 +00:00
Xin Li
ed8ee25f1e [automerger skipped] Merge Android 14 am: d21ccbcad1 -s ours am: f8873de9eb -s ours am: efcde6af97 -s ours am: 956552d750 -s ours am: cf49ad57a1 -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: I234e92a1a83e456e477a076b17e4f95a33a35049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:19:38 +00:00
Xin Li
0f5ed6884e [automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5 -s ours am: 93ba033a58 -s ours am: c718f599a5 -s ours am: f4c95ddd11 -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: I5b0c0a0f06c7b2262f644012f2c52c171df03814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:04:47 +00:00
Xin Li
cf49ad57a1 [automerger skipped] Merge Android 14 am: d21ccbcad1 -s ours am: f8873de9eb -s ours am: efcde6af97 -s ours am: 956552d750 -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: I80b3f6a32ade68b2db8dbf2b5f10e5721a20ae30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:00:08 +00:00
Xin Li
f4c95ddd11 [automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5 -s ours am: 93ba033a58 -s ours am: c718f599a5 -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: I630655f97e83ee0cc40a59682e25d0d0cadf73f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:54:56 +00:00
Xin Li
956552d750 [automerger skipped] Merge Android 14 am: d21ccbcad1 -s ours am: f8873de9eb -s ours am: efcde6af97 -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: Id3b653efea44cb9cb2961b1fb25452124438310b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:50:17 +00:00
Xin Li
c718f599a5 [automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5 -s ours am: 93ba033a58 -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: I8cd7e38795b00575e3a9c9b83036ceb399f843d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:03:09 +00:00
Xin Li
efcde6af97 [automerger skipped] Merge Android 14 am: d21ccbcad1 -s ours am: f8873de9eb -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: I2ce532ed2094515b81e3650187185e3a943cc904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 08:58:38 +00:00
Xin Li
93ba033a58 [automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5 -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: Ia71059ed42364bfdeeec9cffb5577e9e758d36f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:56:18 +00:00
Xin Li
f8873de9eb [automerger skipped] Merge Android 14 am: d21ccbcad1 -s ours 
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9 is already in history

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

Change-Id: If2ab69ee8a3418b257ed51ef5a6ad280ea6e607c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:51:36 +00:00
Xin Li
d5a9337bc5 Merge "Merge Android 14" into main 2023-10-06 05:34:27 +00:00
Xin Li
d21ccbcad1 Merge Android 14 
Bug: 298295554
Merged-In: If03b2db64c827e5027c4fcc96e11a40e171be256
Change-Id: I109f9fdcf9d797b09165ea3b97a4e5ed78f4b957
 2023-10-05 15:31:26 -07:00
Bill Yi
6dd667aa5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbd55477b9 -s ours am: 10a02c95a7 -s ours am: 616b086e61 -s ours am: 8d15b192c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35d7370ea48ea37ebcdb92b2720bf2cd261c1b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:43:27 +00:00
Bill Yi
8d15b192c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbd55477b9 -s ours am: 10a02c95a7 -s ours am: 616b086e61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I045aaab652017f8e7b1aa387c884dbc1dbeb156e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:40:44 +00:00
Bill Yi
616b086e61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbd55477b9 -s ours am: 10a02c95a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07442280b521e0240640a3d2700153530c05200e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:51:44 +00:00
Bill Yi
10a02c95a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbd55477b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a53cad8cc5ad5714e5cac927a91fe13de511210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:59:13 +00:00
Bill Yi
bbd55477b9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If03b2db64c827e5027c4fcc96e11a40e171be256
 2023-08-30 19:25:13 -07:00
Xin Li
d6d4435a0d [automerger skipped] Merge Android U (ab/10368041) am: 85045586f2 -s ours am: 94692daef5 -s ours am: f2a9ca55fb -s ours am: f30a40558c -s ours 
am skip reason: Merged-In If72db59d9df356d4c99a280faa0a49440fba316e with SHA-1 438997997c is already in history

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

Change-Id: I4588584220f99d1757e3262d0539892e8432cfea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 20:37:35 +00:00
Xin Li
f30a40558c [automerger skipped] Merge Android U (ab/10368041) am: 85045586f2 -s ours am: 94692daef5 -s ours am: f2a9ca55fb -s ours 
am skip reason: Merged-In If72db59d9df356d4c99a280faa0a49440fba316e with SHA-1 438997997c is already in history

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

Change-Id: I720d9318f29ab66e7c959fac7c2549a218cc532c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 01:10:28 +00:00
Xin Li
f2a9ca55fb [automerger skipped] Merge Android U (ab/10368041) am: 85045586f2 -s ours am: 94692daef5 -s ours 
am skip reason: Merged-In If72db59d9df356d4c99a280faa0a49440fba316e with SHA-1 438997997c is already in history

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

Change-Id: I8621397781ebf61e7c2642332fd726b5c8121ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 00:34:44 +00:00
Xin Li
94692daef5 [automerger skipped] Merge Android U (ab/10368041) am: 85045586f2 -s ours 
am skip reason: Merged-In If72db59d9df356d4c99a280faa0a49440fba316e with SHA-1 438997997c is already in history

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

Change-Id: I952cbe9ecd5e556eaeb314c6146655f6a8005eff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 23:58:45 +00:00
Xin Li
85045586f2 Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: If72db59d9df356d4c99a280faa0a49440fba316e
Change-Id: Ie8c50607e59466119a6f736c39b704f524bf2902
 2023-08-14 15:32:08 -07:00
David Anderson
e448613ba9 Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae am: 5d80badc05 am: f700391b0c am: 4187344a8a am: 577df889bd 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755

Change-Id: I040dc2cfb08b57d1ee79666e2559668b654b7db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 00:08:17 +00:00
David Anderson
577df889bd Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae am: 5d80badc05 am: f700391b0c am: 4187344a8a 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755

Change-Id: I335edd98ea39b623247d206952e9f8cef327f746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 23:18:07 +00:00
David Anderson
4187344a8a Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae am: 5d80badc05 am: f700391b0c 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755

Change-Id: If34ad5b22e6444053577d6697deb5837221beb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 22:33:23 +00:00
David Anderson
f700391b0c Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae am: 5d80badc05 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755

Change-Id: Ic2cabba05fe5fa81d47f716f465d1e4c33d27a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 21:48:19 +00:00
David Anderson
5d80badc05 Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755

Change-Id: Ie3ad5bdafa423835352dd0e1aeff46fd9aaf78c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 21:06:47 +00:00
David Anderson
d52bdb8eae Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main 2023-08-04 20:14:54 +00:00
Bill Yi
b2b3f62ca7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c8fb3fe72 -s ours am: e3ded1bab0 -s ours am: 7d0563803a -s ours am: f84ea231e3 -s ours am: 3b6acaeb83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3c2efbe171d1a544a3090aed0feaeb17370dfdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:55:47 +00:00
Bill Yi
2e9163b9ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c8fb3fe72 -s ours am: e3ded1bab0 -s ours am: 5b4c0dfbbb -s ours am: 95cce26680 -s ours am: 2ecb611665 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibed9247c57297ceed414de9d6f43dee15a0c64cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:40:25 +00:00
Bill Yi
d6473adf65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c8fb3fe72 -s ours am: e3ded1bab0 -s ours am: 7d0563803a -s ours am: 3a075c6040 -s ours am: d4a70337b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I599b2f0de99aa1c18c175bb5940dfb3b1e1f65ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:38:25 +00:00
Automerger Merge Worker
bfda711d50 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37 -s ours am: 6065832835 -s ours am: 21801d40e1 -s ours am: f1e0229f7a -s ours" into udc-qpr-dev-plus-aosp am: 4091ac200f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5481c5bf3480e698140e03749f5aaa02ce3bb662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:25:17 +00:00
Bill Yi
9de4101f0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37 -s ours am: 6065832835 -s ours am: 21801d40e1 -s ours am: f1e0229f7a -s ours am: bc50a6f236 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcc910d6e9ca8da5fc318a373ca4075b16d45ffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:25:14 +00:00
Bill Yi
3b6acaeb83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c8fb3fe72 -s ours am: e3ded1bab0 -s ours am: 7d0563803a -s ours am: f84ea231e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id382cdb113fb92d5b573ca1a038e3517ba78e175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 16:08:40 +00:00
Bill Yi
2ecb611665 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c8fb3fe72 -s ours am: e3ded1bab0 -s ours am: 5b4c0dfbbb -s ours am: 95cce26680 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I092d86e5cb1f9e0db3bf0ab7332199158f1c9470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 10:10:55 +00:00
Bill Yi
95cce26680 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c8fb3fe72 -s ours am: e3ded1bab0 -s ours am: 5b4c0dfbbb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id04579172e77da318109ae188bc1bce5a5febff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 08:20:58 +00:00
Bill Yi
f84ea231e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c8fb3fe72 -s ours am: e3ded1bab0 -s ours am: 7d0563803a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf39cfe4fe1c487380ae1ec560eea3863e64c833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 07:37:26 +00:00