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
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
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
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
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
Julia Reynolds
94b04df4b4
Redesign individual conversation page
...
Test: atest
Fixes: 151765526
Change-Id: I98d45222104eb03449e469bcd80fd5f23c2935ca
2020-03-20 18:34:24 -04:00
TreeHugger Robot
032228ccf1
[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
...
Change-Id: Ia49accc60215091b0e2b61f33915eb610202c887
2020-03-20 22:33:39 +00:00
Stanley Wang
58f9ae3096
Update Settings strings for R.
...
Bug:143267842
Test: Rebuilt rom and saw different screens.
Change-Id: Id2d89287fe36240d71de2092daac44a5da9be282
(cherry picked from commit 8694c34e09
2020-03-20 22:31:44 +00:00
Joshua Duong
9d46c71fba
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a am: c6e68b5830 am: d910baf535
...
Change-Id: I31f7039ee76111dbcaf56b026c18fcf55c99f118
2020-03-20 20:07:28 +00:00
Joshua Duong
6c7880d673
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306 am: 8017331f64 am: 6e2635d11e
...
Change-Id: Idb4461d1006ad48ccbf6af204b90df117bd99a0e
2020-03-20 20:07:26 +00:00
Joshua Duong
d910baf535
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a am: c6e68b5830
...
Change-Id: Ia4874ceb7cd3ea04595bda9dc30eca71b325764c
2020-03-20 19:44:35 +00:00
Joshua Duong
6e2635d11e
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306 am: 8017331f64
...
Change-Id: I0de8b2ce35b1b6a9526b89051fc9b404b4a9cd05
2020-03-20 19:44:32 +00:00
Joshua Duong
975956b33b
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 2a3d93f2cc
...
Change-Id: Ief352c39bbb008db936122ce790cce57f60defce
2020-03-20 19:29:52 +00:00
Joshua Duong
dfe5331cd2
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 33659c99dc
...
Change-Id: I8ec55cedf8a6e0f1e9a6924aa5ff72b2fef8dc99
2020-03-20 19:29:51 +00:00
Joshua Duong
2a3d93f2cc
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958
...
Change-Id: Iaa687cccc1c6c7667350e8de751d7010cd872cf5
2020-03-20 19:16:42 +00:00
Joshua Duong
33659c99dc
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782
...
Change-Id: I502e79749c5df0b77a9024383545a1d273a5e10d
2020-03-20 19:16:40 +00:00
Joshua Duong
c6e68b5830
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a
...
Change-Id: I869608c3ed88f6dfe3d3a3b8eb08ea03a278861b
2020-03-20 19:15:46 +00:00
Joshua Duong
8017331f64
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306
...
Change-Id: I9293a4340a3e73db11c79c8874340d507d745b87
2020-03-20 19:15:45 +00:00
Joshua Duong
74f5edce8c
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a
...
Change-Id: I67a48698ac2aeca3c31027d6f9d6b8658298e9c1
2020-03-20 19:15:42 +00:00
Joshua Duong
244ac12928
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306
...
Change-Id: If65e56f5a3fda563b742ac0ad15b3f962eca22c2
2020-03-20 19:15:41 +00:00
Joshua Duong
6fcb6b356a
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958
...
Change-Id: I90616c087e665c1d6980b9b6ac76f5f3d37be506
2020-03-20 19:04:50 +00:00
Joshua Duong
6efa33e306
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782
...
Change-Id: I3d3ab0f1b54cef538b8bbc75c48c187a631f9742
2020-03-20 19:04:48 +00:00
Joshua Duong
f5ff928958
Merge "Add visibility control to ADB QR code preference." into rvc-dev
2020-03-20 19:02:49 +00:00
Joshua Duong
2f7a77b782
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev
2020-03-20 19:02:49 +00:00
TreeHugger Robot
3b43a14172
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours am: 8a3c90359e -s ours am: c892944075 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I567deed7570bf3cbfeb511058d1c40ba62fad094
2020-03-20 19:02:20 +00:00
TreeHugger Robot
509af6cb81
[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
...
Change-Id: I5221e3cdea75869dab3afbcb6f8ca8780c678adc
2020-03-20 18:45:21 +00:00
TreeHugger Robot
c892944075
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours am: 8a3c90359e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ac3e3e7d32d788896970716c161262aaf6f7808
2020-03-20 18:38:44 +00:00
TreeHugger Robot
21058df4b3
[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 skip reason: subject contains skip directive
Change-Id: I6078067348010390012aa1ca5789ada3ab833b81
2020-03-20 18:31:56 +00:00
TreeHugger Robot
d661d78c52
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: f261041e88 -s ours am: 8b96070457 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id034b169f697468c4350f81da55ab9eae0a00df3
2020-03-20 18:27:22 +00:00
TreeHugger Robot
f786866134
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours am: 053d2baff2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3d7fdedc1dbc6d8a9d1478b46f17e7d292c0f833
2020-03-20 18:26:02 +00:00
TreeHugger Robot
c6e000ff18
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master
2020-03-20 18:15:00 +00:00
TreeHugger Robot
8a3c90359e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ae49f68605be4f91a35202a0f18ae70101139bd
2020-03-20 18:12:49 +00:00
TreeHugger Robot
8b96070457
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: f261041e88 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia9d63da6c1d774e15de443e7d1bdf76d626a2aae
2020-03-20 18:12:43 +00:00
TreeHugger Robot
053d2baff2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iabc0a63cc8c59c6f0883b5f8e6c4e1ef0384cdfb
2020-03-20 18:12:04 +00:00
TreeHugger Robot
feaa91837a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I56114e77ffad0fe5b9ab7683624332406138bdf5
2020-03-20 17:45:32 +00:00
