Automerger Merge Worker
870ff4581e
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31 am: b6dccade98 am: afe7bcae29
...
Change-Id: I234d9c77b430f7240351066df867393010d87b4f
2020-03-06 07:15:26 +00:00
Automerger Merge Worker
a1f7f0c813
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 5a886e51a6 am: 0f34eda3df
...
Change-Id: I89c623efa1ca4cdeeef9caac463c69cc124bcfa1
2020-03-06 07:15:14 +00:00
Automerger Merge Worker
8ae448ea81
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03 am: c6859fb377
...
Change-Id: I288c8094a53900e9c15dfc795208a98d84c9d4b4
2020-03-06 07:15:08 +00:00
Automerger Merge Worker
0f34eda3df
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 5a886e51a6
...
Change-Id: I572bfa6e141fbac45bcf5074ffcad6ccc992a3ba
2020-03-06 07:03:20 +00:00
Automerger Merge Worker
c6859fb377
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03
...
Change-Id: I53fc0eae3f233e8adb871fe36ef904cbca5ce1e3
2020-03-06 07:03:01 +00:00
Automerger Merge Worker
bf7eb744c6
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 5585d61a51 am: 56f80dad28
...
Change-Id: I56c85307efd4e773731c8c842f1626b2ef086412
2020-03-06 06:54:04 +00:00
Automerger Merge Worker
2fc342a7bf
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31 am: f033a896ff
...
Change-Id: I48bb25b6b091434d5eaf70c0cfa339a90a713763
2020-03-06 06:53:20 +00:00
Automerger Merge Worker
afe7bcae29
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31 am: b6dccade98
...
Change-Id: Ieab18f8fb2769afff73bbc9e5b1409e08bde9ab4
2020-03-06 06:52:56 +00:00
Automerger Merge Worker
5a886e51a6
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c
...
Change-Id: Ia1711e7a5f33f967ab39cc7f43a2e102dc1dd642
2020-03-06 06:44:51 +00:00
Automerger Merge Worker
0e4b3e2d03
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c
...
Change-Id: Iaa9b5708c70120bd64c1df79af82bb08bd45be2f
2020-03-06 06:44:44 +00:00
Automerger Merge Worker
b6dccade98
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31
...
Change-Id: Iccd988b73822fef179ed23457080d7fff1503b11
2020-03-06 06:38:15 +00:00
Automerger Merge Worker
56f80dad28
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 5585d61a51
...
Change-Id: I0966351b670a048544bc47d9ee4ab24eac6cf2a1
2020-03-06 06:38:13 +00:00
Automerger Merge Worker
f033a896ff
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31
...
Change-Id: If9964ee4569c18b27dba54c2db6e200ac7df253e
2020-03-06 06:37:45 +00:00
TreeHugger Robot
a6760b347c
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev
2020-03-06 06:27:29 +00:00
Automerger Merge Worker
5585d61a51
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266
...
Change-Id: Ifa92c4ff403eca485552a2cbc265c41472405e26
2020-03-06 06:14:49 +00:00
Automerger Merge Worker
54fddb8d31
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266
...
Change-Id: Ibf9f04e2ea4f0d44814d65919dfc7d7f60b31fd5
2020-03-06 06:14:42 +00:00
menghanli
a5936ba266
Fix Robotests failure on accessibility ShortcutPreference
...
Bug: 150906744
Bug: 150910193
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ShortcutPreferenceTest
Change-Id: I2feaad60eae3688f6452c29242affc55a80411a0
2020-03-06 13:39:15 +08:00
Automerger Merge Worker
cecb14d5bd
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: 081c161005 am: 56884a847d
...
Change-Id: I3a6144aa03cc59d500207daed1691b288cdb4289
2020-03-06 05:04:14 +00:00
Automerger Merge Worker
9d8a7dfe5a
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: ac742b040a
...
Change-Id: Id26179b8b4bc9f21b91426b1946289a2d40efd89
2020-03-06 04:44:56 +00:00
Automerger Merge Worker
59ce64af51
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours am: f8d7068d84 am: 73800ebe86
...
Change-Id: Ia1b750b9781a6a115c4e1dd06ce79ad106e61790
2020-03-06 04:31:17 +00:00
Automerger Merge Worker
8c2c41340f
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours am: 9b03774e7c am: 60a9d95880
...
Change-Id: I30a8b7f464cdd5b46e1ad5ec514b857b218d08ea
2020-03-06 04:30:42 +00:00
Yi-Ling Chuang
91ec8ce068
Fix AdaptiveSleepPreferenceControllerTest.
...
Fixes: 150910069
Test: robotests
Change-Id: Ie8c33533747d17ec4f0571f5c7ea2de82ce7c66e
2020-03-06 12:14:01 +08:00
Automerger Merge Worker
d5daf57e66
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: 1cf856987b am: 702e5bb44f
...
Change-Id: I1c796271534f824bd68617917beafefd2ed1055d
2020-03-06 04:11:11 +00:00
Automerger Merge Worker
702e5bb44f
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: 1cf856987b
...
Change-Id: I1ae3557444b95d625287d0872792ab042098d005
2020-03-06 03:55:45 +00:00
Automerger Merge Worker
56884a847d
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: 081c161005
...
Change-Id: Ib09b0f3bc7d3e282a4a7868130794d21f0981ea3
2020-03-06 03:39:06 +00:00
Automerger Merge Worker
ac742b040a
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e
...
Change-Id: I43264354b76900c510e2a49d1f702b8440cb7e30
2020-03-06 03:39:01 +00:00
Automerger Merge Worker
1cf856987b
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e
...
Change-Id: I854e60b9980f3ad63eafa519966d98450ecb8bb8
2020-03-06 03:38:51 +00:00
Automerger Merge Worker
e7fd1cbc4e
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76
...
Change-Id: Id9d87fb99e8329572568e064518466017c030fb5
2020-03-06 03:20:31 +00:00
Automerger Merge Worker
081c161005
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76
...
Change-Id: Ie0b97fe0fa7d8da3ad105a44f1686bac23eba775
2020-03-06 03:20:17 +00:00
Betty Chang
997a458e76
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev
2020-03-06 03:01:32 +00:00
Automerger Merge Worker
73800ebe86
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours am: f8d7068d84
...
Change-Id: I722bf3230097a9e07f9aa44c2e9e209e17dfb05a
2020-03-06 00:40:30 +00:00
Automerger Merge Worker
60a9d95880
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours am: 9b03774e7c
...
Change-Id: I01d8903db074c14d717a024fb1d082cb9490732a
2020-03-06 00:39:54 +00:00
Automerger Merge Worker
f8d7068d84
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I36730d6958077d8f43cd1bd259f2071c898c6d8e
2020-03-06 00:26:03 +00:00
Automerger Merge Worker
9b03774e7c
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia410ff9b6c93b99dc2a3e0a162bdc32881901589
2020-03-06 00:25:28 +00:00
Automerger Merge Worker
3dfc9bc59f
Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb
...
Change-Id: I841a54be0ccf815e08eed0b4d769ef01e7151317
2020-03-06 00:12:48 +00:00
Automerger Merge Worker
567f83adbe
Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17
...
Change-Id: I02042e7d32a1daa74e624c18633ef69dace67838
2020-03-06 00:12:13 +00:00
Automerger Merge Worker
42641c920f
[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e am: 29d7026da0 am: 030fcde124 -s ours
...
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11
2020-03-05 20:23:29 +00:00
Automerger Merge Worker
030fcde124
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e am: 29d7026da0
...
Change-Id: Ie7251022c64cbe111e793269bf079f4597da1a08
2020-03-05 20:04:19 +00:00
Automerger Merge Worker
3d6d90c62f
[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e -s ours am: 90d73cdcd7 -s ours
...
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11
2020-03-05 19:47:02 +00:00
Automerger Merge Worker
9de88efcb9
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: 90a99332e7 am: c752d03daf
...
Change-Id: Id2eb3cd0113fa969ba1dc2ec6629b1398818890e
2020-03-05 19:45:26 +00:00
Automerger Merge Worker
29d7026da0
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e
...
Change-Id: I5bc5c54bde2ec94fadef01cb8639d8c025b2ecb6
2020-03-05 19:45:23 +00:00
Automerger Merge Worker
90d73cdcd7
[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e -s ours
...
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11
2020-03-05 19:45:10 +00:00
Automerger Merge Worker
c752d03daf
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: 90a99332e7
...
Change-Id: I62d54c4b09958cff163815eeea16bbaa95b0d581
2020-03-05 19:40:30 +00:00
Automerger Merge Worker
90a99332e7
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
...
Change-Id: Id8ea47aadc2d443bd8ac77cca1f7fc4ba4f63eca
2020-03-05 19:33:47 +00:00
Automerger Merge Worker
fbbda91c9e
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
...
Change-Id: I8141fb2fdb2d0224e4014d9e10686ceb3b304dfd
2020-03-05 19:33:41 +00:00
TreeHugger Robot
54edae5e54
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev
2020-03-05 19:15:30 +00:00
Bill Yi
7d35be74cb
Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE"
2020-03-05 18:27:29 +00:00
Bill Yi
09be9fbb17
Merge stage-aosp-master to aosp-master - DO NOT MERGE
...
Change-Id: Ic40bc7d2b6b306b5cfb0b061e5a3a6f8fe3737c9
2020-03-05 09:51:19 -08:00
Automerger Merge Worker
9f8d9f06f4
Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: 942007d0bf am: a334d7a120 am: f6cb962e31
...
Change-Id: Iafc0391b3e2cefd50e3e4075ad0903ab5d4e66c6
2020-03-05 17:46:07 +00:00
Automerger Merge Worker
2aac11ca45
PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582 am: 43b1a3a5f4 am: a076dbac9f
...
Change-Id: I0efdabd4de4dc3f35168823287793d21076ea157
2020-03-05 17:45:30 +00:00
