Treehugger Robot
1bb9e29e4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3202d82adb
-s ours am: c07f2aa249
-s ours am: ca94ed0350
-s ours am: 5f513949c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420265
Change-Id: I1162d6fe3bd154494ee576cc2057a99a84174fff
2020-09-05 05:44:33 +00:00
Treehugger Robot
5f513949c3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3202d82adb
-s ours am: c07f2aa249
-s ours am: ca94ed0350
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420265
Change-Id: I860f65822e69d05b98755efeabd978e26fd3bfb2
2020-09-05 05:30:58 +00:00
Treehugger Robot
ca94ed0350
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3202d82adb
-s ours am: c07f2aa249
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420265
Change-Id: Idb6ccc86c4f8cd41916618862846123aebe25ee2
2020-09-05 04:34:39 +00:00
Treehugger Robot
c07f2aa249
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3202d82adb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420265
Change-Id: I886ba93e69aa1357ff3db01c62d3c493e20d8e1b
2020-09-05 04:22:02 +00:00
Treehugger Robot
3202d82adb
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 04:07:18 +00:00
Bill Yi
9fa4720b67
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I41f8bdbf7e391f15669d7397e1035276e94018e0
2020-09-04 18:49:03 -07:00
Bill Yi
c488471b2c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de521d2b0d
-s ours am: 9788c905df
-s ours am: 859e99316d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12507993
Change-Id: Ib1b0d1a37f68f0b118f3de63e60c618a7fd772ca
2020-09-02 19:03:55 +00:00
Bill Yi
859e99316d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de521d2b0d
-s ours am: 9788c905df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12507993
Change-Id: I8e0824c348d3e2e62fb9dcbbc46a52cd14ecacf3
2020-09-02 18:34:51 +00:00
Bill Yi
9788c905df
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de521d2b0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12507993
Change-Id: I3f6920c1e86086d202fd9c7090892d1c3da32ea7
2020-09-02 18:05:47 +00:00
Bill Yi
de521d2b0d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia586562662d1a1a833301a19db5cac66e39a689b
2020-09-02 06:36:09 +00:00
Xin Li
1964e5b9a0
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6b3621a8c1
-s ours am: 6c21bdeb90
-s ours am: fbe1853e45
-s ours
...
am skip reason: Change-Id Id0fd2855f322967c1169f246d44e55a9dfdad6bb with SHA-1 934505ba52
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12470106
Change-Id: I30ab1f887223841eaad6c80163cefa0e70305815
2020-08-31 22:51:45 +00:00
Xin Li
fbe1853e45
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6b3621a8c1
-s ours am: 6c21bdeb90
-s ours
...
am skip reason: Change-Id Id0fd2855f322967c1169f246d44e55a9dfdad6bb with SHA-1 934505ba52
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12470106
Change-Id: I85c75c2ceb53aab6b5689b396d74949faf4d6bfa
2020-08-31 22:37:52 +00:00
Xin Li
6c21bdeb90
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6b3621a8c1
-s ours
...
am skip reason: Change-Id Id0fd2855f322967c1169f246d44e55a9dfdad6bb with SHA-1 934505ba52
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12470106
Change-Id: I0a8b956877ff1d30b80b3e5d4da87a3822e1403c
2020-08-31 22:02:14 +00:00
Xin Li
6b3621a8c1
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: Id0fd2855f322967c1169f246d44e55a9dfdad6bb
Change-Id: Ic3ff0b38939d817df63ab5fdc2860781b69a53ce
2020-08-27 10:16:03 -07:00
Treehugger Robot
7082d05439
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
am: bc606682d2
am: be7f315c9d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248
Change-Id: Ie2a694be2789d3e5e14f052e78566235a1e73104
2020-08-25 00:22:02 +00:00
Treehugger Robot
be7f315c9d
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
am: bc606682d2
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248
Change-Id: I575b28ea2a279d08895416570216c571263405cc
2020-08-24 23:20:27 +00:00
Treehugger Robot
bc606682d2
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248
Change-Id: I8ba2762b11802ba60bc79fe4ae5fe6eea3437cd6
2020-08-24 22:12:33 +00:00
Treehugger Robot
d66516ea7c
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248
Change-Id: I03831287fb050c5ed536714d15085fd6efb09d2b
2020-08-24 21:16:18 +00:00
Treehugger Robot
f820e62701
Merge "Fix flaky tests by require root for minadbd_tests"
2020-08-24 20:05:05 +00:00
Kelvin Zhang
d7ae5a020c
Fix flaky tests by require root for minadbd_tests
...
minadbd tests require access to /dev/fuse, therefore needs to run as
root. This test has been flaky because root preparetor wasn't specified.
Bug: 165604640
Test: atest MinadbdServicesTest
Change-Id: I6ee1e2deede4352e28aad79c436ec5974e7d64f6
2020-08-24 14:36:01 -04:00
Treehugger Robot
7f269b07c1
Merge "Return the correct action for PromptAndWait" am: 99277fa6af
am: c55e7fd95d
am: b5d418af52
am: 4360c29cf7
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888
Change-Id: I86a2c82568018023c427b2b8a505b636527db170
2020-08-18 04:02:09 +00:00
Treehugger Robot
4360c29cf7
Merge "Return the correct action for PromptAndWait" am: 99277fa6af
am: c55e7fd95d
am: b5d418af52
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888
Change-Id: I70131aeb3dd61b165c6671bf26f8e69e5381433d
2020-08-18 03:44:23 +00:00
Treehugger Robot
b5d418af52
Merge "Return the correct action for PromptAndWait" am: 99277fa6af
am: c55e7fd95d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888
Change-Id: Ie2d0b0dc1d5f6383fac4142cab4391816a419ab1
2020-08-18 03:33:23 +00:00
Treehugger Robot
c55e7fd95d
Merge "Return the correct action for PromptAndWait" am: 99277fa6af
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888
Change-Id: I8b8a07f433aa34cd29de401f3137c6992812dc20
2020-08-18 03:17:12 +00:00
Treehugger Robot
99277fa6af
Merge "Return the correct action for PromptAndWait"
2020-08-18 03:05:47 +00:00
Kelvin Zhang
9ebf0653bf
Return the correct action for PromptAndWait
...
Bug: 163613552
Test: mma
Change-Id: I204f6aa272c2b56725e658e5613530b27bd223c6
2020-08-13 18:16:40 -04:00
Bill Yi
59274b4765
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c
-s ours am: f810978038
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12288327
Change-Id: I24a17e192374b0fce3621798144507369d2f3159
2020-08-03 05:34:49 +00:00
Bill Yi
5a8c87e512
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c
-s ours am: 40abfc5d4d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12288327
Change-Id: Ic931c874bdc7d25c3e9c489cc58c2cf8ac7fd5a3
2020-08-03 05:33:15 +00:00
Bill Yi
f810978038
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12288327
Change-Id: Ie1839d5390d45f28e1450b9df0214206b31060d5
2020-08-03 05:09:46 +00:00
Bill Yi
40abfc5d4d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12288327
Change-Id: Iee28a5365320f99997d4ac528655786d49316373
2020-08-03 05:08:25 +00:00
Bill Yi
f81364cd8c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If8fe8b3e5842518a2c61da1ecf1aaddcfc9c24e3
2020-08-02 17:10:14 +00:00
Tianjie Xu
6e35461b69
Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2
am: 74538db684
am: 435f3d3f16
am: 8885ef0529
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051
Change-Id: Id01eaa738f1f7e6fdc4581bfccf4521e2f2bd346
2020-07-24 20:01:00 +00:00
Tianjie Xu
8885ef0529
Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2
am: 74538db684
am: 435f3d3f16
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051
Change-Id: I1073cc8f2e1710681d5aba74e037480023188747
2020-07-24 19:49:50 +00:00
Tianjie Xu
435f3d3f16
Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2
am: 74538db684
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051
Change-Id: I9fdb4e98eebc0caa9aa1a2bcc9e188a2b6fa6a81
2020-07-24 19:31:13 +00:00
Tianjie Xu
74538db684
Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051
Change-Id: Ibfa4188fb6efc1455eb48069ce925adecfc9fd6c
2020-07-24 19:12:49 +00:00
Tianjie Xu
435a5fc0c2
Merge changes I0f3f0333,If447b2cf
...
* changes:
Update language to comply with Android’s inclusive language guidance
Fix some wording to comply with respectful-code
2020-07-24 18:57:26 +00:00
Bill Yi
9955de88ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe58fdea5e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12224599
Change-Id: Id7216dd705cae9a1df0fe80d77ab7eafd47d3934
2020-07-24 16:41:12 +00:00
Bill Yi
fe58fdea5e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1d30ee5bb29c52be0076d46fcaa2744c116a0f93
2020-07-24 00:48:03 -07:00
Tianjie
78d1514173
Update language to comply with Android’s inclusive language guidance
...
https: //source.android.com/setup/contribute/respectful-code
Bug: 161896447
Test: Unit tests pass
Change-Id: I0f3f0333dbccc94241a096ca5d3d9bc28c281492
2020-07-23 14:02:21 -07:00
Tianjie
1bc976a74e
Fix some wording to comply with respectful-code
...
https: //source.android.com/setup/contribute/respectful-code
Test: Unit tests pass
Change-Id: If447b2cf923f6bc7a3a3fb5f69b9fbc06a200ebb
2020-07-23 13:07:24 -07:00
Bill Yi
e228b43979
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d
-s ours am: 934505ba52
-s ours am: 21bd948d94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454
Change-Id: Id8b15ec9eab18723cb3f3d9977ed53f2e5d42b4f
2020-07-18 02:47:41 +00:00
Automerger Merge Worker
afd3e32c65
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d
-s ours am: 412ba02427
-s ours am: 1923ee31f2
-s ours" into rvc-qpr-dev-plus-aosp
2020-07-18 02:47:39 +00:00
Bill Yi
79c47f4a0c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d
-s ours am: 412ba02427
-s ours am: 1923ee31f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454
Change-Id: I1b8f486868900d774d422250b8befa5c4360b1da
2020-07-18 02:47:03 +00:00
Bill Yi
e05da93108
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d
-s ours am: 412ba02427
-s ours am: 96785f4748
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454
Change-Id: I1a7bc5210b5d8061e5722fb51bede5305456d330
2020-07-18 02:46:57 +00:00
Bill Yi
21bd948d94
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d
-s ours am: 934505ba52
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454
Change-Id: I2f364e4721f25aced4a402c72dac603b220167c9
2020-07-18 02:34:52 +00:00
Bill Yi
1923ee31f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d
-s ours am: 412ba02427
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454
Change-Id: Ic80b42aadfbd85f808da3f183b288c437927190d
2020-07-18 02:34:40 +00:00
Bill Yi
96785f4748
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d
-s ours am: 412ba02427
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454
Change-Id: I26a3a9067f77c052def3ee7978119f28448c9603
2020-07-18 02:34:24 +00:00
Bill Yi
934505ba52
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454
Change-Id: Id0fd2855f322967c1169f246d44e55a9dfdad6bb
2020-07-18 02:09:06 +00:00
Bill Yi
412ba02427
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454
Change-Id: Ib11ee9c70934c84f402e90a21bd169442f665ce5
2020-07-18 02:09:02 +00:00
Bill Yi
fd33b4992d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id59b183068ff2cdf8c58f42b9b7c8406cc04b8f2
2020-07-17 17:40:48 -07:00