Bill Yi
c59dc080ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: I2c1aa46ba97bfd9094471fc00a2c62fdabba6313
2020-09-09 21:09:58 +00:00
Bill Yi
28825ad9e4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7bc2aaf9e23573eb179950feb6edb427877f0c3f
2020-09-09 13:56:30 +00:00
Bill Yi
3f9c81573d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I3b5e256b0d5be8922d8716955d1744b140835122
2020-09-06 19:52:05 +00:00
Bill Yi
ee8c3875ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0eedcd75ce4aca6fffdd86fb7da8b177c01a9696
2020-09-06 12:31:40 +00:00
Treehugger Robot
8b2080e7cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours am: f75d48d9f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: Ieac8fcc9f4209d6682556ba2dd89f0191d138ffe
2020-09-05 19:31:31 +00:00
Treehugger Robot
f75d48d9f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: I8d01018b9590b293954df3c7690477b99ee72e4e
2020-09-05 18:56:42 +00:00
Treehugger Robot
ada75ad54d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
2020-09-05 18:44:03 +00:00
Treehugger Robot
681beda2f8
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 18:32:54 +00:00
Treehugger Robot
3867542239
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours am: 0749b2e5b1
-s ours am: 966f8a889b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: I5eed324de754c4ab34a26002ce1ca122dde916f0
2020-09-05 15:17:20 +00:00
Treehugger Robot
52b60555b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161
-s ours am: a4bfe8a50f
-s ours am: 2d241c544d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392
Change-Id: I044f323df73102f23202d6d2b3e70333fa2ef6d4
2020-09-05 15:17:13 +00:00
Treehugger Robot
701ea4dff8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897
-s ours am: 809f01fc74
-s ours am: d1b40cfb18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389
Change-Id: I1b8b1e30adb80b033f5491a099e257fc522434ee
2020-09-05 15:17:00 +00:00
Treehugger Robot
966f8a889b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours am: 0749b2e5b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: Ifeeb5b1ed6feed0931e8b486485ab03cf1d37555
2020-09-05 15:02:28 +00:00
Treehugger Robot
2d241c544d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161
-s ours am: a4bfe8a50f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392
Change-Id: Id8aea55919ca80fb40dc091d3325889f08fbc926
2020-09-05 15:02:22 +00:00
Treehugger Robot
d1b40cfb18
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897
-s ours am: 809f01fc74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389
Change-Id: I55ff3c61ba1febe39d468c0a59cd558dd08ed677
2020-09-05 15:02:05 +00:00
Treehugger Robot
0749b2e5b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: I4918d11aef9655cc94daaefdbc2c6400823beaa9
2020-09-05 14:26:56 +00:00
Treehugger Robot
a4bfe8a50f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392
Change-Id: Ib43bd3e6188189f638e1c583907708eeb270f5df
2020-09-05 14:26:49 +00:00
Treehugger Robot
809f01fc74
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389
Change-Id: I2087ff5e1201a5024e7f6948976e073e1f68312f
2020-09-05 14:26:25 +00:00
Treehugger Robot
e30450cd68
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 13:55:03 +00:00
Treehugger Robot
992e9bc161
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 13:53:33 +00:00
Treehugger Robot
88fe7c9897
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 13:51:43 +00:00
Bill Yi
af59e5d24f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8a59656075c476e775ad386c0f6169b565ad3586
2020-09-05 13:15:50 +00:00
Bill Yi
821f954a9a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie0ee665d6f119236268486b2d199de22463bd29d
2020-09-05 12:40:07 +00:00
Bill Yi
7cd983aed7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9421d2ca455dff9dcd838d2e5b232b29e5498a0f
2020-09-05 02:10:54 -07:00
Bill Yi
47a48929ac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If4262b66f910ae9cff97a30a89b354938d787805
2020-09-05 01:26:27 -07:00
TreeHugger Robot
9a474ea6e4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3
-s ours am: 444c856107
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510888
Change-Id: I0a69909d3fdef7b4d95d74f1958ef76ae6e5003e
2020-09-02 18:34:40 +00:00
TreeHugger Robot
444c856107
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510888
Change-Id: If3b574996dcfa6bce46af7187589ddb254bfa807
2020-09-02 18:05:38 +00:00
TreeHugger Robot
11304fb8a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-02 17:50:47 +00:00
TreeHugger Robot
7d16f97c97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631
-s ours am: bc565bd615
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510886
Change-Id: I79f5560d71e8830e434458ce0f70858c6e3935fb
2020-09-02 17:49:23 +00:00
TreeHugger Robot
bc565bd615
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510886
Change-Id: I1895d604f90e4f8d497c7d9dee89463efd531bda
2020-09-02 17:12:25 +00:00
TreeHugger Robot
4a3e39cb13
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a
-s ours am: edb75a2eec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510887
Change-Id: I0ec0fe0fa16a7ea6dd2768e16dc5b4c3f8a753f2
2020-09-02 16:36:19 +00:00
Anton Hansson
0df917748c
[automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4
-s ours am: 633379f309
-s ours
...
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12508095
Change-Id: I861f802d5fef4c3ca7be53e9d1162c6482312324
2020-09-02 16:34:49 +00:00
TreeHugger Robot
74ab66f631
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-02 16:31:43 +00:00
TreeHugger Robot
edb75a2eec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510887
Change-Id: I3fcb638648ca92b1b363b77cc8ae4a04ea6268e2
2020-09-02 16:11:19 +00:00
TreeHugger Robot
11fd725f1a
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-02 16:06:50 +00:00
Anton Hansson
633379f309
[automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4
-s ours
...
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12508095
Change-Id: I2d0f192fb7d7cbd5e60563375caab027489658f6
2020-09-02 16:00:11 +00:00
Anton Hansson
0e5e0c77d4
Add explicit dep on framework-wifi.impl
...
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.
Bug: 157451444
Bug: 161767237
Bug: 167568930
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: Cherry-pick
Merged-In: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
2020-09-02 15:41:40 +00:00
Bill Yi
b9ff4275f3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I01190d1453f17ee5a42b303cfd201a4a8ed5a458
2020-09-02 13:28:38 +00:00
Bill Yi
25e90ee101
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6efada3aedd313f97b1405db8164499180316b89
2020-09-02 12:53:56 +00:00
Bill Yi
0009d56501
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I412e0c9881bc5de07ce964b2dc8892bb3e23db60
2020-09-02 12:17:48 +00:00
Treehugger Robot
0b9ba3c3cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5
-s ours am: b372e3fbcf
-s ours am: 958cb755cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618
Change-Id: Ib131571114f795322d115a1926b8e4920968f8e2
2020-09-02 07:48:42 +00:00
Treehugger Robot
8942b451cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458
-s ours am: f3ae142f67
-s ours am: ca40ee1a3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623
Change-Id: I086d2a926c9089f19e9bf5a26e04a8e6210afd92
2020-09-02 07:48:23 +00:00
Treehugger Robot
958cb755cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5
-s ours am: b372e3fbcf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618
Change-Id: Ie0228bd344d0b755ccc745109a2369331d15b622
2020-09-02 07:29:52 +00:00
Treehugger Robot
ca40ee1a3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458
-s ours am: f3ae142f67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623
Change-Id: I7e811f65e77821275c46b300115828a56583611f
2020-09-02 07:29:37 +00:00
Treehugger Robot
b372e3fbcf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618
Change-Id: I94bcd92bbc7c3476585bad6fc1334130dcebae56
2020-09-02 07:11:35 +00:00
Treehugger Robot
f3ae142f67
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623
Change-Id: I41cca1a0a56dc19ae68b420aadc78e3cfc3121c9
2020-09-02 07:11:06 +00:00
Treehugger Robot
76947837c5
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-02 06:35:32 +00:00
Treehugger Robot
22a9ba1458
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-02 06:30:33 +00:00
Bill Yi
7ec0bc9bef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I43aa317e93b4ee5e484314bf40cdbc2e5e4aa442
2020-09-02 05:42:17 +00:00
Bill Yi
256ea9e29b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I15697e753d245ca812bd2cba4d174c54811bde91
2020-09-02 05:05:27 +00:00
Xin Li
744507f78b
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558
-s ours am: d92daf10ef
-s ours
...
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12484180
Change-Id: I96cb62de1d30aed204295f417deab1d806bda62e
2020-09-01 21:46:50 +00:00