Treehugger Robot
1e0da76374
Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e
am: 859ebabebd
am: 50ed6648b1
am: cfccc925f6
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081
Change-Id: I8efd8d4c63c6bd5eb4c83d2951c9b7c25ef21804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 01:44:24 +00:00
Treehugger Robot
cfccc925f6
Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e
am: 859ebabebd
am: 50ed6648b1
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081
Change-Id: Ie0e68487a06dbca84e6a5275fcbb86c097cb763b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 01:16:27 +00:00
Treehugger Robot
50ed6648b1
Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e
am: 859ebabebd
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081
Change-Id: Ie993d5a357e77928d0a2dd5ea5ae5198c03a17b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 00:17:19 +00:00
Treehugger Robot
859ebabebd
Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081
Change-Id: I13a5ccb2c28173859d1768066719872dceed20f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 23:47:10 +00:00
Treehugger Robot
f07eaeb72e
Merge "Fix doing silent update,power cut/restoration,screen is turned on"
2022-09-27 23:14:04 +00:00
Hannah.Hsu
d43ec47f3b
Fix doing silent update,power cut/restoration,screen is turned on
...
[Description]
1. In the current code, when tv enter recovery mode, it will
write "boot-recovery" into the BCB command field by default.
This is a protection mechanism to ensure that tv can re-enter
recovery mode continues OTA upgrade after power cut/power restoration.
So, when re-enter recovery mode, since there is no "quiescent"
in the boot parameters, the screen will turn on.
2. And we hope the screen will be turned off when tv re-enter
recovery mode to continue OTA upgrade.
3. We made the following modify:
In reocvery mode,According to GetBoolProperty
"ro.boot.quiescent"to determine whether it is a quiescent
boot this time,and then write "boot-recovery, quiescent"
or"boot-recovery" accordingly.
[Test Report]
1.boot up ok.
2.silent update ok.
(the screen is turned off when interrupting/
resume or complete the upgrade)
3.OTA update ok.
(the screen is turned on when interrupting/
resume or complete the upgrade)
Change-Id: Ic68898f1a8e9ab176556ee2b61efec4d8d5d36e2
2022-09-27 09:32:20 +08:00
Treehugger Robot
872002acd6
Merge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897
am: 71a1763a22
am: 581fd1501b
am: b9754fd79f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2205736
Change-Id: Ic2928881207a47262f636333439f0933f434592a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 10:08:03 +00:00
Treehugger Robot
b9754fd79f
Merge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897
am: 71a1763a22
am: 581fd1501b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2205736
Change-Id: I69adf0ce6c461c1398189e91c85c93ee7d2f1ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 09:11:29 +00:00
Treehugger Robot
581fd1501b
Merge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897
am: 71a1763a22
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2205736
Change-Id: I1494af60d2db6b3d811a5f2bc59bdb5ea1169629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 07:59:40 +00:00
Treehugger Robot
71a1763a22
Merge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2205736
Change-Id: I3ccaadcd270449cec151dc29d98005e98d77cdab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 06:59:34 +00:00
Treehugger Robot
3f125fa897
Merge "minui: Support main fbdev connector in multi connector Blank function"
2022-09-13 06:30:12 +00:00
Treehugger Robot
785a57c223
Merge "Remove py2 usages" am: a773d405d1
am: a0ef72ec5f
am: cf6787a035
am: 9ac03302f7
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2214944
Change-Id: I35108471c4a917f39e3953360fd8ec7cc71cda15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 23:49:54 +00:00
Treehugger Robot
9ac03302f7
Merge "Remove py2 usages" am: a773d405d1
am: a0ef72ec5f
am: cf6787a035
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2214944
Change-Id: Id290d6dda14e8ff771d40499116eb11d448dd0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 23:22:08 +00:00
Treehugger Robot
cf6787a035
Merge "Remove py2 usages" am: a773d405d1
am: a0ef72ec5f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2214944
Change-Id: Ide4a814793673b7d8e95c33474effc355725b40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 22:42:49 +00:00
Treehugger Robot
a0ef72ec5f
Merge "Remove py2 usages" am: a773d405d1
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2214944
Change-Id: I10e2491bfe1ccbd2fa88bdbb40a52457988e9f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:55:00 +00:00
Treehugger Robot
a773d405d1
Merge "Remove py2 usages"
2022-09-12 21:25:33 +00:00
Cole Faust
03a12e2ac9
Remove py2 usages
...
Bug: 203436762
Test: m nothing
Change-Id: I22087b1bbcb4fff64cc41210c9d74537197bb367
2022-09-12 12:27:06 -07:00
Kelvin Zhang
9478a87fae
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours am: 031df89b1d
-s ours am: 8474ab13e1
-s ours am: 8cea2956a5
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Ic67d8c99269fa02a907129c6b20d6a9a3306c398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 21:27:23 +00:00
Kelvin Zhang
ecf530b56d
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours am: 031df89b1d
-s ours am: 8474ab13e1
-s ours am: dd784622e2
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Ieeaff4b0b6c9130d6f089886764c14839a32727e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 21:14:34 +00:00
Kelvin Zhang
dd784622e2
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours am: 031df89b1d
-s ours am: 8474ab13e1
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: I92c447462ff891f0e6e14df7fc46b93451627da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:46:25 +00:00
Kelvin Zhang
8cea2956a5
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours am: 031df89b1d
-s ours am: 8474ab13e1
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: I1ccb7072d77bee389f9953f940ca93ce323331c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:46:12 +00:00
Kelvin Zhang
9dd56e54a6
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours am: 031df89b1d
-s ours am: 9e35382187
-s ours am: f33168e3d7
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Ia84f1269e16a37947a2c69ebb1c85c7918861229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:34:55 +00:00
Kelvin Zhang
f33168e3d7
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours am: 031df89b1d
-s ours am: 9e35382187
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: I36f2947d6a53df6c24ad5d7462862b6f27f4e05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:33:11 +00:00
Kelvin Zhang
5fe098a346
[automerger skipped] [automerged blank] Fix misconfigured recovery host test 2p: d3cd440d2d
2p: affcbd2d7c
am: 39063160c6
-s ours am: f5dfa74569
-s ours am: 26fc6c1766
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 620bd456d5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Ie25e2d6c9179ea7ea54763858a9b0e9a4c84c38d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:31:33 +00:00
Kelvin Zhang
6f4234d3a0
[automerger skipped] [automerged blank] Fix misconfigured recovery host test 2p: d3cd440d2d
2p: affcbd2d7c
am: 39063160c6
-s ours am: 2649c470a8
-s ours am: 86395c05f6
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 39c684a71c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Ice11b927e301af1477676e921ff8dc5a328c65f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:17:29 +00:00
Kelvin Zhang
8474ab13e1
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours am: 031df89b1d
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: I9efa56e42eb2fc60f545d5630ea9859fa45dda6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:11:44 +00:00
Kelvin Zhang
22c397b58f
[automerger skipped] [automerged blank] Fix misconfigured recovery host test 2p: d3cd440d2d
2p: affcbd2d7c
am: 39063160c6
-s ours am: 2649c470a8
-s ours am: f67cac423c
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 39c684a71c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Ibaf589562832cdc04d72f8c08dbd148b3bd021aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:03:03 +00:00
Kelvin Zhang
9e35382187
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours am: 031df89b1d
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: I5e66e0667ae208c50235bd872778e70ed9436876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:01:25 +00:00
Kelvin Zhang
26fc6c1766
[automerger skipped] [automerged blank] Fix misconfigured recovery host test 2p: d3cd440d2d
2p: affcbd2d7c
am: 39063160c6
-s ours am: f5dfa74569
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 620bd456d5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: I54f18823db8a2e16f565e653da2b411febe33a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 19:20:08 +00:00
Kelvin Zhang
f67cac423c
[automerger skipped] [automerged blank] Fix misconfigured recovery host test 2p: d3cd440d2d
2p: affcbd2d7c
am: 39063160c6
-s ours am: 2649c470a8
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 39c684a71c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Ib319c4764f383f7a751ddddbdb4418a7bc90249d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 19:19:53 +00:00
Kelvin Zhang
86395c05f6
[automerger skipped] [automerged blank] Fix misconfigured recovery host test 2p: d3cd440d2d
2p: affcbd2d7c
am: 39063160c6
-s ours am: 2649c470a8
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 39c684a71c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: I7e3d8b92b8073bb0707a0f3ca013286ed333ded3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 19:19:52 +00:00
Kelvin Zhang
031df89b1d
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Id7629f94c35b2ef895c6411e5df82f1a98f12013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 19:16:43 +00:00
Kelvin Zhang
8ce6c88860
[automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Ib00fc5cd62b651c0ddd59c4b528b57f01c433ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 18:49:25 +00:00
Kelvin Zhang
2649c470a8
[automerger skipped] [automerged blank] Fix misconfigured recovery host test 2p: d3cd440d2d
2p: affcbd2d7c
am: 39063160c6
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 39c684a71c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: I8c180ee4de5f000cf55506f7e32d6b5c71c8908d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 18:49:09 +00:00
Kelvin Zhang
f5dfa74569
[automerger skipped] [automerged blank] Fix misconfigured recovery host test 2p: d3cd440d2d
2p: affcbd2d7c
am: 39063160c6
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 620bd456d5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: I7e925039c138d28c27d63648dfba119c545ebdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 18:46:30 +00:00
Kelvin Zhang
39063160c6
[automerged blank] Fix misconfigured recovery host test 2p: d3cd440d2d
2p: affcbd2d7c
...
Blank merge reason: Change-Id I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 620bd456d5
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Bug: 241353143
Change-Id: I984b464556f34f72f925e0c779dad4293e042c74
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
2022-09-08 16:10:55 +00:00
Kelvin Zhang
affcbd2d7c
[automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Bug: 241353143
Change-Id: Id9773f5f3230922fb540191b0b6bfca32878b544
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
2022-09-08 16:10:43 +00:00
Kelvin Zhang
f3419014dc
[automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Bug: 241353143
Change-Id: I6404a00aa135d0af5e8bca738d4d2c1fa37619d8
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
2022-09-08 16:10:42 +00:00
Kelvin Zhang
d3cd440d2d
Fix misconfigured recovery host test
...
Test: atest recovery_host_test
Bug: 241353143
Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0
(cherry picked from commit 9ce95441b2
)
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
2022-09-08 16:10:30 +00:00
Fred Chiou
d1d706d35b
[automerger skipped] Merge changes If58ea542,I18c5e0f3 into tm-qpr-dev am: 3d43ec37f4
-s ours
...
am skip reason: Merged-In If58ea5423f64420db3e5bd9307194b56129d6543 with SHA-1 b44702a80a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19784430
Change-Id: If03921cd12496fa6d91b528c70e2329495749f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 06:50:51 +00:00
fredchiou
60b8c7cfb4
[automerger skipped] recovery_ui:Add support for multiple connectors switch am: f2f5aa2e2e
-s ours
...
am skip reason: Merged-In If58ea5423f64420db3e5bd9307194b56129d6543 with SHA-1 b44702a80a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19784430
Change-Id: Ib8888a731dba2a73325743c824cb298e1a6aaabf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 06:50:50 +00:00
Fred Chiou
3d43ec37f4
Merge changes If58ea542,I18c5e0f3 into tm-qpr-dev
...
* changes:
recovery_ui:Add support for multiple connectors switch
minui: Add API to support multiple connectors detection
2022-09-07 06:17:08 +00:00
TreeHugger Robot
c36ccba722
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0b490d6b23
-s ours am: 301cf33047
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19842878
Change-Id: I53c9d3d6e8099bbfc04b3a560133e69ff4aab7a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 23:26:06 +00:00
Bill Yi
ceeb609d7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b2b229fbe
-s ours am: d71ddf3613
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19842878
Change-Id: I6468cad7e7f87c0bb04937a37fb96de1dfd901c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 23:25:49 +00:00
TreeHugger Robot
6798e6cfd6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0b490d6b23
-s ours am: 63b50d8807
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19842878
Change-Id: I90ef21ea7c89ff4ee2a6b7b23545c0f83602e904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 23:14:12 +00:00
Bill Yi
feb41f1bb5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b2b229fbe
-s ours am: acdef1777a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19842878
Change-Id: I4f630465a1ff063ebcc72e44a8c1309757334224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 23:13:57 +00:00
TreeHugger Robot
301cf33047
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0b490d6b23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19842878
Change-Id: I7218c14d9f48d0fb2f776f18ff6fad25a0d6872c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 22:51:04 +00:00
Bill Yi
d71ddf3613
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b2b229fbe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19842878
Change-Id: I3fe3f8eb1e5e5837a55a38f3b2cba5457a59a5c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 22:50:47 +00:00
TreeHugger Robot
63b50d8807
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0b490d6b23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19842878
Change-Id: I404887151c887c45d599230764ed4b1cfb4a93fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 22:47:44 +00:00
Bill Yi
acdef1777a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b2b229fbe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19842878
Change-Id: Ibf1cff437790bd63e7e6a2a9570b5ac1d4df836d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 22:47:28 +00:00