TreeHugger Robot
2c2fa7449e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:37:37 +00:00
Bill Yi
98244a3368
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a86406ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550348
Change-Id: Idbdf716187c2fd18f0f4b6484278f30f400b9254
2021-08-13 17:55:55 +00:00
Bill Yi
42bb37b4b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib47aac206927e53d691f1069e3b752b0f89aac90
2021-08-13 01:45:10 +00:00
Bill Yi
51a86406ce
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iae5d3427ec299206191f9cb1821d4a61e8b1b22e
2021-08-13 01:42:38 +00:00
Bill Yi
a68f721a33
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e597faf178
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15515317
Change-Id: Iff38327a5bf7f63560234576f81b9c4b2526254f
2021-08-11 19:37:18 +00:00
Bill Yi
e597faf178
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I863ac592a537a997999b3cc5d9bddb4dbae34fd8
2021-08-10 13:26:16 +00:00
Bill Yi
0e083066c2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29ec9925cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15492072
Change-Id: I4cf1c194b1d72e3d20f76535beab310aaa03e468
2021-08-07 19:07:08 +00:00
Bill Yi
3c18472cf1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id27881b4f8ba0ae1e74f8bc8db0320d48f678068
2021-08-07 12:47:20 +00:00
Bill Yi
29ec9925cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I425118cca58bc33674b8c7cbe09f23fb3723cea7
2021-08-07 12:42:28 +00:00
Bill Yi
51a144391d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64898ea3f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15192188
Change-Id: I40dd87870655a572424a82e01f9404d29de89ed5
2021-07-03 03:50:35 +00:00
Bill Yi
ef90ab7b16
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e679e5773
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15192990
Change-Id: I0072871bf5f5369b5dd0f2be4c8cbc125f7a92df
2021-07-03 03:41:45 +00:00
Bill Yi
42c11d9b87
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I615873a60232a720aed242972af03014967b3bdf
2021-07-02 22:55:28 +00:00
Bill Yi
6e679e5773
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I84b147a52db1507ba1351c768b740d05265d7ce0
2021-07-02 22:53:03 +00:00
Bill Yi
64898ea3f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I007c5387105b2839a4f31581e58800cd3ece07a2
2021-07-02 22:50:35 +00:00
Kelvin Zhang
e631225204
Check SPL downgrade before install OTA in recovery
...
Applying an SPL downgrade package can cause boot failures
(/data failed to decrypt). Today's ota_from_target_files
tool already try to prevent this. But Packages generated
using older tools are still around.
Add check in recovery to prevent such OTA package from
installing.
Test: th
Test: Sideload an OTA with newer SPL, make sure check passes
Test; Sideload an OTA with older SPL, make sure check fails
Bug: 186581246
Bug: 188575410
cherry-picked from aosp/1708986
cherry-picked from commit: 33c62fc4b8
Change-Id: Icffe8097521c511e151af023a443ccbb4b59e22c
2021-05-19 20:58:02 +00:00
Bill Yi
48a7e7dd7b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1cda13316ca0951ffc5eef1170aed2595b7c2dca
2021-05-08 18:49:48 -07:00
Bill Yi
353a5ac00f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25491dc368
-s ours am: 77bacf9369
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14469279
Change-Id: I24aa287887bd9b20998d458a56ebd86fcdcdecc7
2021-05-08 01:05:54 +00:00
Bill Yi
77bacf9369
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25491dc368
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14469279
Change-Id: I5e18ff98765ae143a1dc8057572748371a9bcc9f
2021-05-08 00:49:05 +00:00
Bill Yi
98894d1c0b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a0dc131542
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14469278
Change-Id: I37bbdcbcee1714d7f85ff420e4f7a96b08e2c98c
2021-05-07 23:27:57 +00:00
Bill Yi
25491dc368
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18f34fb71130d5bd2959ccc4f82959dffb58dedf
2021-05-07 15:55:27 +00:00
Bill Yi
a0dc131542
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4a3fe4b3e8b9260c03caf5c9391eda4d9d7c67f0
2021-05-07 15:54:13 +00:00
Treehugger Robot
3b870faae2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9df2d8e6bd
-s ours am: e17d51b01e
-s ours am: d2ef32c095
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1684570
Change-Id: Ic1f99c529e3ed62cc201d5dac8913b3be752176f
2021-04-22 21:04:00 +00:00
Treehugger Robot
d2ef32c095
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9df2d8e6bd
-s ours am: e17d51b01e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1684570
Change-Id: I0239a1009b0c38d3e0ee97d0bc36b8c632940fe6
2021-04-22 20:42:45 +00:00
Treehugger Robot
e17d51b01e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9df2d8e6bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1684570
Change-Id: I6f89c30082430757bbf12fec6e17d179e766336d
2021-04-22 20:26:05 +00:00
Treehugger Robot
9df2d8e6bd
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-22 20:02:03 +00:00
Bill Yi
ad054ca141
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I88d58cbf784b4801d60e7eca5c4d1495dc6bb8fc
2021-04-22 10:11:57 -07:00
Treehugger Robot
35587e8e43
Merge "Use gtest_prod_headers." am: 9c7ee78b48
am: b9fbbbb775
am: eca3159e45
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1681765
Change-Id: Ibe2683dbc2dd6e151a89341cb7d916c3890c3d30
2021-04-21 02:15:36 +00:00
Treehugger Robot
eca3159e45
Merge "Use gtest_prod_headers." am: 9c7ee78b48
am: b9fbbbb775
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1681765
Change-Id: I34ef43d6482440b025b697d5042d85c90b1213d8
2021-04-21 01:53:22 +00:00
Treehugger Robot
b9fbbbb775
Merge "Use gtest_prod_headers." am: 9c7ee78b48
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1681765
Change-Id: Ia0d8223a0a08fd5a2e7c0a8c5a332f104dd9d803
2021-04-21 01:13:54 +00:00
Treehugger Robot
9c7ee78b48
Merge "Use gtest_prod_headers."
2021-04-21 00:53:20 +00:00
Elliott Hughes
a85d7a0936
Use gtest_prod_headers.
...
Bug: http://b/185916167
Test: treehugger
Change-Id: I3407052df4f12b01acc4a75c6bd0759f7a4b2c4c
2021-04-20 11:58:05 -07:00
Bill Yi
45ab8d16a8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 488f7664ab
-s ours am: 96b82dfdf3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14237821
Change-Id: Ib7a7b9c617132923f558ee0381c2ff19ecff4270
2021-04-19 22:20:34 +00:00
Bill Yi
cd7930fe8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0c2d264f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14237820
Change-Id: I6b1ed2d8616736467c99186a47312406e3f7f736
2021-04-19 22:10:15 +00:00
Bill Yi
96b82dfdf3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 488f7664ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14237821
Change-Id: I611150345bd048cf30c1ff1ae27cd85f58e31978
2021-04-19 21:59:50 +00:00
Bill Yi
00874ceb73
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I60b8d46e36b46008493de2e451d3182787109775
2021-04-19 19:55:21 +00:00
Bill Yi
488f7664ab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibf0801f85dee0f2009f3864f78e2534c24276676
2021-04-19 19:52:41 +00:00
Bill Yi
b0c2d264f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibab2c8b52e7c6908935fee7de18d0be0d0184733
2021-04-19 19:51:27 +00:00
Bill Yi
0c955dd484
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5cc773de7c06c6a4d6aec2498e39c5c3633b6dd5
2021-04-15 21:36:47 +00:00
Bill Yi
daf7da35f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e7bba7620
-s ours am: 551ca7568c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14161797
Change-Id: Ic69bcf65e984ac47bbcb6ec9d625965e7166f591
2021-04-12 19:53:24 +00:00
Bill Yi
551ca7568c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e7bba7620
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14161797
Change-Id: I000e1d6becb15dae8e731d144468f586cd3aa6d3
2021-04-12 19:04:44 +00:00
Bill Yi
5e7bba7620
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0795c8ddd7d70038a5b6935a6a2a37dde36bb41e
2021-04-12 09:23:11 -07:00
Bill Yi
add68b3fc8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ec0b3b489
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14134299
Change-Id: Ia4a532109d0dc4751a49a07e63751088beb386c8
2021-04-09 17:11:17 +00:00
Bill Yi
2ec0b3b489
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2319c692bc7f1d457ece26843bc660bce027f21d
2021-04-08 23:36:47 -07:00
Bill Yi
5f6d08f526
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e045405d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14093285
Change-Id: I2c7fd349aa9d5124ab581000c7c91de5d086dfbd
2021-04-05 17:14:45 +00:00
Bill Yi
8e045405d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id1c247ae55b8ff5311ae07200b8b9f618cf53f3f
2021-04-05 04:56:28 -07:00
TreeHugger Robot
1238812ed4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-01 21:12:51 +00:00
Treehugger Robot
e807efd1ea
[automerger skipped] Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd83390
am: 4810c99f09
am: 20c3f60afe
-s ours
...
am skip reason: skip tag Change-Id I4499dafa3bb3bfcbb8a97dcfd5b4593db467fbd3 with SHA-1 8929f899ac
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1660606
Change-Id: I23eb24ff64e3be1a731b502f970f3f6501444d8b
2021-03-31 23:29:44 +00:00
Treehugger Robot
20c3f60afe
Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd83390
am: 4810c99f09
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1660606
Change-Id: Ic6f5008f010cc24cf7d78c3955ec6d535212e98b
2021-03-31 22:43:42 +00:00
Treehugger Robot
4810c99f09
Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd83390
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1660606
Change-Id: Ib1a6d554c29ca3d8fb227c7a153bf810373e9922
2021-03-31 22:16:54 +00:00
Treehugger Robot
853dd83390
Merge "Revert "Update ImageGenerator to match the latest font names.""
2021-03-31 21:49:21 +00:00