Jeff Tinker
c8baa3edf7
[automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours am: 01b3da1dbd am: 70aa2882a6
...
Change-Id: Ic649d0d9dc9884139343a6017d600e3e1065c91f
2020-05-20 20:46:54 +00:00
Jeff Tinker
70aa2882a6
[automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours am: 01b3da1dbd
...
Change-Id: I0a367b53e4c85ea3db4b8452073c64d836aa721e
2020-05-20 20:33:02 +00:00
Jeff Tinker
01b3da1dbd
[automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours
...
am skip reason: skipped by user jtinker
Change-Id: I41cccce692c4cd294c74054cb072e0ada6f41941
2020-05-20 20:14:25 +00:00
Jeff Tinker
a5f7479f5a
Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c
...
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
2020-05-20 19:50:57 +00:00
Jeff Tinker
9e974afd4c
Merge "Revert "[Settings] Remove mobile network v1""
2020-05-20 19:37:56 +00:00
Jeff Tinker
9c657c34f4
Revert "[Settings] Remove mobile network v1"
...
This reverts commit daf6c9e85b
2020-05-20 19:14:57 +00:00
Julia Reynolds
04d50c9709
Switch from shortlabel to label
...
Test: atest
Bug: 157140669
Change-Id: Iebcb2f076fef33b6f3ce16326af4e4c5c6770459
2020-05-20 14:23:43 -04:00
TreeHugger Robot
3abd4a0c52
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: 8ebbe4db5c -s ours am: d384741938 -s ours am: 632c1870c1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie6329a505a4d4520ab9498530b7f00553a12bd05
2020-05-20 17:09:14 +00:00
TreeHugger Robot
56a8bb0d8b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: ac648d6916 -s ours am: 5446562899 -s ours am: 5898ac0e40 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie5847750e8bda1bc3da62f5b4f7dd5b10d5dcf24
2020-05-20 17:08:20 +00:00
TreeHugger Robot
632c1870c1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: 8ebbe4db5c -s ours am: d384741938 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie58e881015910e75f2e3a5d1f2fbd6eac7c8df9a
2020-05-20 16:50:06 +00:00
TreeHugger Robot
5898ac0e40
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: ac648d6916 -s ours am: 5446562899 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4c45fea8c66a52be4069cec7d34eeb7a84fb33fc
2020-05-20 16:49:19 +00:00
TreeHugger Robot
d384741938
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: 8ebbe4db5c -s ours
...
am skip reason: subject contains skip directive
Change-Id: I726fa5c772a31d7b45b93554d0499b819629e686
2020-05-20 16:35:01 +00:00
TreeHugger Robot
5446562899
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: ac648d6916 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I313496899c2833bb4238d6c2c024c0bce89b067b
2020-05-20 16:34:22 +00:00
Julia Reynolds
39ceee9e00
Only show work profile notifs if enabled
...
Test: manual, turn off profile
Fixes: 157137055
Change-Id: Ic042300297c09d132e793d13fec18b23d24f2cc8
2020-05-20 12:29:39 -04:00
TreeHugger Robot
ac648d6916
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1a6119bcc82c95a996d762eb9a28e6a2878f1ca1
2020-05-20 16:22:06 +00:00
TreeHugger Robot
8ebbe4db5c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If1a628dce575776369bb61847735e7a6951fbe6e
2020-05-20 16:22:02 +00:00
TreeHugger Robot
42a6154347
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-20 16:00:46 +00:00
TreeHugger Robot
abfe5cacb8
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: ba98f11c56 am: f6d7ce24b0 am: 9ac0f1b9bf
...
Change-Id: I93230c0438a3081e816e616a9f51d2632472266d
2020-05-20 15:44:36 +00:00
Automerger Merge Worker
8685c9338e
Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194 am: f2e45400fc am: 026fe497b5
...
Change-Id: I5706d1edd51aee59183ac3558f890b4e4adf35f3
2020-05-20 15:44:23 +00:00
TreeHugger Robot
9fbdd524f4
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: 742dd6f60c am: cf1486003e am: 9a3278579b
...
Change-Id: If13f45336a1d58678093e29b3be8289a782f7340
2020-05-20 15:43:46 +00:00
TreeHugger Robot
9ac0f1b9bf
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: ba98f11c56 am: f6d7ce24b0
...
Change-Id: I643251947f1966c323786a8af5417e3c0119d80f
2020-05-20 15:23:53 +00:00
Automerger Merge Worker
026fe497b5
Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194 am: f2e45400fc
...
Change-Id: Id1fce889d0e4143f73c5dedee6d5f01789839ce5
2020-05-20 15:23:45 +00:00
TreeHugger Robot
9a3278579b
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: 742dd6f60c am: cf1486003e
...
Change-Id: I9cdc2f4a9eb2a8bb04b023f0bd7e789327640d98
2020-05-20 15:22:40 +00:00
TreeHugger Robot
f6d7ce24b0
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: ba98f11c56
...
Change-Id: I05a82bbf4ef6f294ee887d2497dd62dad6ab8811
2020-05-20 15:03:04 +00:00
Automerger Merge Worker
f2e45400fc
Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194
...
Change-Id: I15801851140bacc91006a5f2f9791eebc2534e2c
2020-05-20 15:02:58 +00:00
TreeHugger Robot
cf1486003e
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: 742dd6f60c
...
Change-Id: Ia5e40b1a8df8f8d59881e0ec5d11e71178db6004
2020-05-20 15:02:49 +00:00
Automerger Merge Worker
a06ef7b194
Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp
2020-05-20 14:42:44 +00:00
TreeHugger Robot
1518db1927
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674
...
Change-Id: Ica90e78597092bc44aabd28c5357fbe17ecffafe
2020-05-20 14:42:40 +00:00
TreeHugger Robot
ba98f11c56
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc
...
Change-Id: Ia5cccbd846203fb0acbc6207d37091d1a3e908b3
2020-05-20 14:42:33 +00:00
TreeHugger Robot
742dd6f60c
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc
...
Change-Id: I764291b14b76fa7dd24644fe3ae739f324f4f5e9
2020-05-20 14:42:31 +00:00
TreeHugger Robot
d06d373674
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
...
Change-Id: I1867ea8309ed5ec9e8bda40f68cd6e56c69b1755
2020-05-20 14:32:11 +00:00
TreeHugger Robot
3ba40628fc
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
...
Change-Id: Ibc06bd838df06258f98e87fcb3a9da43c47be504
2020-05-20 14:31:50 +00:00
TreeHugger Robot
946e3adeda
Merge "Show subtext for previously connected devices on BT card" into rvc-dev
2020-05-20 14:10:31 +00:00
Bonian Chen
f18ee845f6
[automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours am: e7495a57dc -s ours am: 47b98dd082 -s ours am: 460a330411 -s ours
...
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70
2020-05-20 14:10:24 +00:00
Bonian Chen
460a330411
[automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours am: e7495a57dc -s ours am: 47b98dd082 -s ours
...
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70
2020-05-20 13:54:38 +00:00
Bonian Chen
47b98dd082
[automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours am: e7495a57dc -s ours
...
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70
2020-05-20 13:32:24 +00:00
Bonian Chen
e7495a57dc
[automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours
...
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70
2020-05-20 13:19:34 +00:00
Bonian Chen
3d46b0e5ec
[automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours
...
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70
2020-05-20 13:03:03 +00:00
Bonian Chen
075a17c995
Merge "[Settings] Remove mobile network v1" am: 10799d12fd
...
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
2020-05-20 12:45:32 +00:00
Bonian Chen
10799d12fd
Merge "[Settings] Remove mobile network v1"
2020-05-20 12:28:20 +00:00
TreeHugger Robot
dae1414efb
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 1f339625a5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I651c10b791deda09858966caa1a7aaf26650607d
2020-05-20 12:21:13 +00:00
TreeHugger Robot
1f339625a5
Merge "Import translations. DO NOT MERGE"
2020-05-20 12:05:37 +00:00
TreeHugger Robot
8cfb7f8bd9
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: b396f85c2c -s ours
...
am skip reason: subject contains skip directive
Change-Id: Icdf0c513ca808c1abc66587e130187832fc29e65
2020-05-20 10:51:36 +00:00
TreeHugger Robot
b396f85c2c
Merge "Import translations. DO NOT MERGE"
2020-05-20 10:32:25 +00:00
Automerger Merge Worker
85be0ea291
Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: cf0ef7ae38" into rvc-d1-dev-plus-aosp am: 64616b4168 am: b4150802d9 am: b50d365fdf
...
Change-Id: I0bba6b1134a8737a4f5bf48fb319cc2f985c0691
2020-05-20 09:43:20 +00:00
Automerger Merge Worker
e4f51414dd
Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b" into rvc-d1-dev-plus-aosp am: e828ebf069 am: fffb0764c9 am: 88c1ee765f
...
Change-Id: Ie2fd992906ecbfbdd86a8f31efe166877da6fdfe
2020-05-20 09:42:55 +00:00
Amy Hsu
3b1e0cdb98
Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b am: e67e058f26 am: 5e8ba70140 am: 048eb1b00a
...
Change-Id: Ie9e4c603c2b71ff5efaaa3449fd01c20a8ccb0cf
2020-05-20 09:42:26 +00:00
TreeHugger Robot
980b77511d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: 5c655b06a2 -s ours am: 7d40624fe1 -s ours am: eb655e4098 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Idc52bb1016a20421057b5673bc61659dedc37018
2020-05-20 09:42:08 +00:00
TreeHugger Robot
c3e9e9a1c5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: 4af7cebe18 -s ours am: 8233c0573f -s ours am: bd9020b7fb -s ours am: 6992256d5f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I95c6c6cf113689cdccd9232102c09a6341fa8101
2020-05-20 09:42:02 +00:00
TreeHugger Robot
88e6120e8b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: ede8bf5f96 -s ours am: 8eeabd86cf -s ours am: ab2a707d18 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6aea6a5c32469128c2383c8db1eda0083324a35f
2020-05-20 09:41:57 +00:00
