Stanley Wang
adc4662924
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0 am: 83d06ef1f4
...
Change-Id: Ia58b6202a8e5abba5b39a0887ee491ffd8679ada
2020-03-21 06:27:19 +00:00
Stanley Wang
ef2bc18b14
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 78e9bdf9b7
...
Change-Id: I22cb0a9367e8ecf02b73e5507e735d90aeff61fc
2020-03-21 06:05:47 +00:00
Stanley Wang
3277ad0cf6
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3
...
Change-Id: Ida303b4590886c38e90f8e233920db186102269f
2020-03-21 06:05:27 +00:00
Stanley Wang
ba8e20218e
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: 6c6837424d -s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
2020-03-21 06:05:13 +00:00
Stanley Wang
83d06ef1f4
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0
...
Change-Id: Ib375c8aee3658797113370493feb7e7d527a8939
2020-03-21 06:04:18 +00:00
Stanley Wang
b9289ea2ef
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3
...
Change-Id: I1dfbb0dd95d894ff970b11f858a6ca69cf621405
2020-03-21 06:04:00 +00:00
Stanley Wang
ca95aaae17
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0
...
Change-Id: Ie23a43915338769acbaebc4e3547397afd95a4b6
2020-03-21 06:03:47 +00:00
Stanley Wang
78e9bdf9b7
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
...
Change-Id: Iaeda191d1877ae40f0b3911cea911a876da97f0b
2020-03-21 05:49:32 +00:00
Stanley Wang
6c6837424d
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
...
Change-Id: If6f30aa662c0fd4696722df8e7f31b49b7929157
2020-03-21 05:49:25 +00:00
Stanley Wang
76c2ec77e3
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
...
Change-Id: I35d894cd31031fa8019ca7b6f1552dcd0b1c1412
2020-03-21 05:49:13 +00:00
Stanley Wang
a8d78418c0
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
...
Change-Id: I87df8f40a569b89d2275d5ce38e379eb3f9f96b9
2020-03-21 05:48:43 +00:00
Stanley Wang
fb39c70875
Merge "Update Settings subtexts for R." into rvc-dev
2020-03-21 05:30:25 +00:00
Stanley Wang
61e7d2c24c
Merge "Update Settings strings for R." into rvc-dev
2020-03-21 05:30:00 +00:00
TreeHugger Robot
9a238e65a7
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3baeb593c7 am: c8fcfd82d9 am: c459111b66
...
Change-Id: I5c891a6b4b002eeefa44d41592dfdf98621b61d5
2020-03-21 04:10:27 +00:00
TreeHugger Robot
507268f721
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 981d9e37cb am: 0677fed3e5 am: 2df4eb3518
...
Change-Id: Id7dd8cfa98291e0d8599cf2d00afb63662cdadf7
2020-03-21 04:09:47 +00:00
TreeHugger Robot
5d418f3082
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3e87cf919d am: 1e734997b0
...
Change-Id: I565e9b04d0f1f1b6429513847f10065e8fd44d97
2020-03-21 04:08:52 +00:00
TreeHugger Robot
c459111b66
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3baeb593c7 am: c8fcfd82d9
...
Change-Id: If4f129050b9b8fb22afbc75a241622b2ccba4c05
2020-03-21 04:07:48 +00:00
TreeHugger Robot
c8fcfd82d9
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3baeb593c7
...
Change-Id: I42a007cfacde7d1ae1fc91220866afe8fd13538b
2020-03-21 03:56:12 +00:00
TreeHugger Robot
2df4eb3518
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 981d9e37cb am: 0677fed3e5
...
Change-Id: Idbbbe9977b25d038137fb0ab6ac1a6170e3d88c7
2020-03-21 03:55:14 +00:00
TreeHugger Robot
1e734997b0
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3e87cf919d
...
Change-Id: Ib9efb227322d05a7560edbb0e16b5b8d28880563
2020-03-21 03:54:13 +00:00
TreeHugger Robot
3baeb593c7
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285
...
Change-Id: I193e8c5cb34efe53d9b62953fe8c3cddca485707
2020-03-21 03:39:45 +00:00
TreeHugger Robot
0677fed3e5
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 981d9e37cb
...
Change-Id: Ie18bb3d1d1cb3a9e376ff7fb8ab88b1cffd4adfa
2020-03-21 03:38:38 +00:00
TreeHugger Robot
3e87cf919d
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285
...
Change-Id: I7b84db149a1410e1fb495b493690c7ae98d73dbb
2020-03-21 03:38:12 +00:00
TreeHugger Robot
17c6211285
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
...
Change-Id: I5b2b39c33b525407b1b6da300dc853704f727061
2020-03-21 03:14:30 +00:00
TreeHugger Robot
981d9e37cb
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
...
Change-Id: Idd8c529261fd853b5aba28f88139008ea489aa40
2020-03-21 03:14:28 +00:00
TreeHugger Robot
a4e3d5ef8b
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev
2020-03-21 02:58:15 +00:00
TreeHugger Robot
d6fc4c1c21
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167 am: 10b3981f72 am: 60dfe57f61 am: d5c0c27497
...
Change-Id: I2a8dbdadeed8b410949c7dd1761170e010b9715f
2020-03-21 02:45:12 +00:00
TreeHugger Robot
8e1a1dddf1
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: a37f3bc902 am: 4fc06ea996 am: b890ef52c0
...
Change-Id: I20ac185f1af2ed83a796b1369cab583f468c2a1c
2020-03-21 02:43:15 +00:00
TreeHugger Robot
d5c0c27497
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167 am: 10b3981f72 am: 60dfe57f61
...
Change-Id: I62507ccb2eff8b859253199813980a4d4c35cd2e
2020-03-21 02:42:18 +00:00
TreeHugger Robot
d30c1c658c
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167 am: 08f2027965 am: 715707acb6
...
Change-Id: I14d75c545804cd67eac60cbc340bc34b9717b3fe
2020-03-21 02:41:07 +00:00
TreeHugger Robot
b890ef52c0
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: a37f3bc902 am: 4fc06ea996
...
Change-Id: I0b012f2d70d3a37e6ab2b6bc8ccced69c5ac9674
2020-03-21 02:25:12 +00:00
TreeHugger Robot
715707acb6
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167 am: 08f2027965
...
Change-Id: Iea8225d604f7f0a6528a7fa886bb373dd9396245
2020-03-21 02:24:57 +00:00
TreeHugger Robot
60dfe57f61
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167 am: 10b3981f72
...
Change-Id: Ic40439ac6621949dc7a00be354adf0a04bd2cddd
2020-03-21 02:24:51 +00:00
TreeHugger Robot
4fc06ea996
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: a37f3bc902
...
Change-Id: Ia1347ce6ba421352fd64622b90f6165eba79ebe5
2020-03-21 02:14:31 +00:00
TreeHugger Robot
10b3981f72
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167
...
Change-Id: I26026f93904a147300c843625170d2585d68b910
2020-03-21 02:14:16 +00:00
TreeHugger Robot
08f2027965
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167
...
Change-Id: I6f60c394bafde75d50797a8cfae6799386ecf8b9
2020-03-21 02:13:44 +00:00
TreeHugger Robot
a37f3bc902
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
...
Change-Id: I3e34e330287c1c3cee02e9c3985ac0e41c66969e
2020-03-21 01:57:05 +00:00
TreeHugger Robot
cdca282167
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
...
Change-Id: I52415cc41bf4e613a63459394579265e27c87c76
2020-03-21 01:56:41 +00:00
TreeHugger Robot
785e3f26bd
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev
2020-03-21 01:39:29 +00:00
Mady Mellor
b299e0a543
String updates
...
Test: treehugger
Bug: 151965589
Change-Id: Ibba6f9440aaa495c6197d3862a5e8224d026bb6b
2020-03-21 01:11:51 +00:00
Joshua Duong
d79afd2cb1
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 2a3d93f2cc am: 975956b33b am: b5f4acc345
...
Change-Id: I7a0880443b376edf72fb5d02152ef4ab72aa59b2
2020-03-21 01:05:54 +00:00
Joshua Duong
7651aea75a
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 33659c99dc am: dfe5331cd2 am: 0e788af2e3
...
Change-Id: I0e33face9c4361aef13d6f9dfd7abea7cc582dcc
2020-03-21 01:05:52 +00:00
Joshua Duong
4c95b607b8
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a am: 74f5edce8c am: 45108730e4
...
Change-Id: I33a343434fe7a022044fb5571d282b817433c40e
2020-03-21 01:04:02 +00:00
Joshua Duong
5a86403127
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306 am: 244ac12928 am: 5887ad2f99
...
Change-Id: Iab0a09ef3712a99d27d511595812e67447353cff
2020-03-21 01:04:00 +00:00
Joshua Duong
b5f4acc345
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 2a3d93f2cc am: 975956b33b
...
Change-Id: I238c2e143681ef4f85b1c5231780fe46dba309a1
2020-03-20 23:40:58 +00:00
Joshua Duong
0e788af2e3
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 33659c99dc am: dfe5331cd2
...
Change-Id: Ie22274efabb353780e307cce0dc5071ac4d493cb
2020-03-20 23:40:56 +00:00
Joshua Duong
45108730e4
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a am: 74f5edce8c
...
Change-Id: Ibcd4f39f9fc291a877fc7e281d14c92fd1887dab
2020-03-20 23:25:35 +00:00
Joshua Duong
5887ad2f99
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306 am: 244ac12928
...
Change-Id: I71c62ef9f9cbc6c5a2a03174aae1a3fbc6fb833f
2020-03-20 23:25:34 +00:00
TreeHugger Robot
afed8881a3
[automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18 -s ours am: 21058df4b3 am: 509af6cb81 am: 032228ccf1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0658c6a52bc8c8b7b25d3fe6cb1c6d8e00facf28
2020-03-20 23:24:33 +00:00
Malcolm Chen
b56fea748f
Add text showing in Settings footer that 5G may not be capable in DSDS.
...
Bug: 151657272
Test: build
Change-Id: Ieeb0787f76fcf41cc55e85ef8bf375dd77c9d6b5
2020-03-20 16:14:14 -07:00
