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
63e7d398e9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de521d2b0d
-s ours am: 9788c905df
-s ours am: 859e99316d
-s ours am: c488471b2c
-s ours am: 90ebe1612e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12507993
Change-Id: Iee42933ba47a21572b22526a0da18aead6fc865d
2020-09-02 20:03:34 +00:00
Bill Yi
90ebe1612e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de521d2b0d
-s ours am: 9788c905df
-s ours am: 859e99316d
-s ours am: c488471b2c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12507993
Change-Id: Icc9b2ef291df81e213c9361e2e3ba8ae7eb34fad
2020-09-02 19:21:35 +00: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
9205e6703e
[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: 1964e5b9a0
-s ours am: 45a87913be
-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: Idc526b7d61eefd8170f085f66a678c9e07098a71
2020-08-31 23:52:26 +00:00
Xin Li
45a87913be
[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: 1964e5b9a0
-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: I156007c32f71a192c90c89259472585b6edc724b
2020-08-31 23:11:13 +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
e02247070b
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
am: bc606682d2
am: be7f315c9d
am: 7082d05439
am: 9ae74b2435
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248
Change-Id: I870efee7c151bf7a4f0aef06a1964fbf40902dcb
2020-08-25 01:59:47 +00:00
Treehugger Robot
9ae74b2435
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
am: bc606682d2
am: be7f315c9d
am: 7082d05439
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248
Change-Id: I3e2225259a6ed94fe2ef79a4182c684b54a4cbca
2020-08-25 00:50:46 +00: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
8762648bcf
Merge "Return the correct action for PromptAndWait" am: 99277fa6af
am: c55e7fd95d
am: b5d418af52
am: 4360c29cf7
am: 7f269b07c1
am: de8e518668
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888
Change-Id: I2c887d06b47949369159f160aa01c3c4c807bc85
2020-08-18 04:30:14 +00:00
Treehugger Robot
de8e518668
Merge "Return the correct action for PromptAndWait" am: 99277fa6af
am: c55e7fd95d
am: b5d418af52
am: 4360c29cf7
am: 7f269b07c1
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888
Change-Id: I1c611157b4c31957cf873ed3390f38f9d759499e
2020-08-18 04:15:03 +00: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
50af4ecd0e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c
-s ours am: f810978038
-s ours am: 59274b4765
-s ours am: 3d9de410e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12288327
Change-Id: I292b5703f5b014d64cff8d64d3172a6a59057f4a
2020-08-03 06:15:43 +00:00
Bill Yi
5ad9197aad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c
-s ours am: 40abfc5d4d
-s ours am: 5a8c87e512
-s ours am: 0afd35d5b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12288327
Change-Id: I11bac7d0f2f05a5804988d27d007cc1054aef70b
2020-08-03 06:15:35 +00:00
Bill Yi
3d9de410e4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c
-s ours am: f810978038
-s ours am: 59274b4765
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12288327
Change-Id: I3e7dd859456dc1e5835940cce34ca6bd49a2877f
2020-08-03 05:54:38 +00:00
Bill Yi
0afd35d5b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c
-s ours am: 40abfc5d4d
-s ours am: 5a8c87e512
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12288327
Change-Id: I98c860f9652fa9f7fc86ffe52ce6858cf6293e1f
2020-08-03 05:54:29 +00: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
Bill Yi
22dc338781
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I116cbdd9d0162a1ce2f60366fe6f13b76e188ac1
2020-07-31 23:03:10 +00:00
Tianjie Xu
e60da4f982
Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2
am: 74538db684
am: 435f3d3f16
am: 8885ef0529
am: 6e35461b69
am: 88963fb8f6
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051
Change-Id: I64c66f45cbb4a7b173c0f55626542cee10faf938
2020-07-24 20:33:06 +00:00
Tianjie Xu
88963fb8f6
Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2
am: 74538db684
am: 435f3d3f16
am: 8885ef0529
am: 6e35461b69
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051
Change-Id: I62b4a7cc5231baadb3a19f27db562abaa63f1fa5
2020-07-24 20:14:30 +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