Fan Zhang
c25fe8d6d1
Merge "Fix CodeInspectionTest" into qt-dev am: 4b54ad9bd5
...
am: d9fb048712
2019-04-22 16:02:46 -07:00
Fan Zhang
d9fb048712
Merge "Fix CodeInspectionTest" into qt-dev
...
am: 4b54ad9bd5
2019-04-22 15:14:51 -07:00
TreeHugger Robot
4b54ad9bd5
Merge "Fix CodeInspectionTest" into qt-dev
2019-04-22 21:37:29 +00:00
Lei Yu
cc8f78bf30
Merge "Add mms preference and controller" into qt-dev am: f3365e911d
...
am: 7ec9c1db1d
2019-04-22 11:35:04 -07:00
Lei Yu
39cb151ead
Merge "Remove feature flag for slice injection" into qt-dev am: fe393599a0
...
am: cbb86c71b6
2019-04-22 11:20:01 -07:00
Lei Yu
7ec9c1db1d
Merge "Add mms preference and controller" into qt-dev
...
am: f3365e911d
2019-04-22 11:14:34 -07:00
Lei Yu
cbb86c71b6
Merge "Remove feature flag for slice injection" into qt-dev
...
am: fe393599a0
2019-04-22 11:10:37 -07:00
Lei Yu
f3365e911d
Merge "Add mms preference and controller" into qt-dev
2019-04-22 17:55:34 +00:00
Lei Yu
fe393599a0
Merge "Remove feature flag for slice injection" into qt-dev
2019-04-22 17:49:52 +00:00
Tim Peng
8f130628fa
Remove "Play media to" when no connected device am: 99ed023ca4
...
am: 568520bdf5
2019-04-22 10:23:26 -07:00
Tim Peng
568520bdf5
Remove "Play media to" when no connected device
...
am: 99ed023ca4
2019-04-22 10:03:39 -07:00
Tim Peng
99ed023ca4
Remove "Play media to" when no connected device
...
Bug: 130251782
Test: make -j42 RunSettingsRoboTests
Change-Id: Id40199a67aef48b99f59cf6e04f93be2abe5e8fc
2019-04-22 06:09:36 +00:00
Bill Yi
d3b475fc67
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: f263f489e2 -s ours
...
am: b2e51354e7
2019-04-20 21:55:41 -07:00
Bill Yi
b2e51354e7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: f263f489e2
2019-04-20 21:50:42 -07:00
TreeHugger Robot
f263f489e2
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-21 04:43:31 +00:00
TreeHugger Robot
4428eb0624
Merge "Import translations. DO NOT MERGE"
2019-04-21 02:42:38 +00:00
Bill Yi
80d2278070
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I681232854213f3b89d0543d30c640622d759a396
2019-04-20 17:58:18 -07:00
Bill Yi
7cd3661791
Import translations. DO NOT MERGE
...
Change-Id: I90c45c06f57d03b07411318467c38abc0b725c55
Auto-generated-cl: translation import
2019-04-20 17:15:08 -07:00
Jonathan Scott
1f8154690f
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev am: 5a8cf48813
...
am: 28a697103d
2019-04-20 16:29:55 -07:00
Jonathan Scott
28a697103d
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
...
am: 5a8cf48813
2019-04-20 16:24:57 -07:00
TreeHugger Robot
5a8cf48813
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
2019-04-20 23:16:25 +00:00
TreeHugger Robot
fbaae11bd7
Merge "Remove deprecated AccessPoint#getConfigName() in SavedNetworkComparator"
2019-04-20 22:09:41 +00:00
Mark Chien
826f37e86a
[automerger skipped] Merge "Ignore the outdated entitlement check" into qt-dev am: 77b7618138 -s ours
...
am: 3e4c927e60f9f0d11782
2019-04-20 00:00:19 -07:00
Mark Chien
57659716d0
Merge "Ignore the outdated entitlement check" am: d7885ca73a am: 7b30503dc4
...
am: f886be6999
2019-04-19 23:45:35 -07:00
Mark Chien
3e4c927e60
[automerger skipped] Merge "Ignore the outdated entitlement check" into qt-dev
...
am: 77b7618138f9f0d11782
2019-04-19 22:06:49 -07:00
Mark Chien
77b7618138
Merge "Ignore the outdated entitlement check" into qt-dev
2019-04-20 04:41:52 +00:00
Mark Chien
f886be6999
Merge "Ignore the outdated entitlement check" am: d7885ca73a
...
am: 7b30503dc4
2019-04-19 21:07:49 -07:00
Mark Chien
7b30503dc4
Merge "Ignore the outdated entitlement check"
...
am: d7885ca73a
2019-04-19 20:26:15 -07:00
Beverly
91d48e2c31
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev am: f09245150d
...
am: 08de5537ef
2019-04-19 19:06:04 -07:00
Mark Chien
d7885ca73a
Merge "Ignore the outdated entitlement check"
2019-04-20 02:05:33 +00:00
Lei Yu
88ba448b3a
Merge "Fix battery robo test" into qt-dev am: fc48118694
...
am: 87bdcd3ce2
2019-04-19 18:56:31 -07:00
Salvador Martinez
f0ecd2bf7d
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev am: 022af8ca10
...
am: 72d99dd38c
2019-04-19 18:07:31 -07:00
Fan Zhang
1b1bfc6508
Merge "Fix typo" into qt-dev am: 33f136fdec
...
am: cd576bfaae
2019-04-19 18:06:38 -07:00
Fan Zhang
812db12067
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev am: ac76a480bd
...
am: 4a4b2a5b00
2019-04-19 18:05:50 -07:00
Fan Zhang
85e4de5122
Merge "Add @Ignore for all failing tests." into qt-dev am: 1830440231
...
am: 5a0629d12f
2019-04-19 18:04:49 -07:00
Beverly
08de5537ef
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev
...
am: f09245150d
2019-04-19 17:28:45 -07:00
Lei Yu
87bdcd3ce2
Merge "Fix battery robo test" into qt-dev
...
am: fc48118694
2019-04-19 17:20:53 -07:00
TreeHugger Robot
f09245150d
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev
2019-04-19 23:20:10 +00:00
TreeHugger Robot
fc48118694
Merge "Fix battery robo test" into qt-dev
2019-04-19 23:13:51 +00:00
Salvador Martinez
72d99dd38c
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
...
am: 022af8ca10
2019-04-19 15:56:21 -07:00
Lei Yu
5fbde81391
Merge "Add SettingsPolicy to control BT feature" into qt-dev am: 125ab50a55
...
am: 142ca23949
2019-04-19 15:55:15 -07:00
Fan Zhang
cd576bfaae
Merge "Fix typo" into qt-dev
...
am: 33f136fdec
2019-04-19 15:54:48 -07:00
Fan Zhang
4a4b2a5b00
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev
...
am: ac76a480bd
2019-04-19 15:53:26 -07:00
Fan Zhang
5a0629d12f
Merge "Add @Ignore for all failing tests." into qt-dev
...
am: 1830440231
2019-04-19 15:21:59 -07:00
Salvador Martinez
022af8ca10
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
2019-04-19 22:00:27 +00:00
Jonathan Scott
4316259aa0
Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE
...
This is already covered by
getAvailabilityStatus_somePackagesAllowed_shouldBeAvailable and
getAvailabilityStatus_allPackagesAllowed_shouldBeAvailable.
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=CrossProfileCalendarPreferenceControllerTest
Fixes: 130896049
Change-Id: I3dbbbde693750c69e042f7c19143730cc8e313ff
2019-04-19 22:19:21 +01:00
Fan Zhang
5c9db0cb5e
Fix CodeInspectionTest
...
Fixes: 130897640
Test: robo
Change-Id: Ic2d952e4d76bb0a2be6eab7ddc999b56656132a6
2019-04-19 14:14:51 -07:00
Lei Yu
2632f45010
Fix battery robo test
...
Fixes: 130896701
Test: RunSettingsRoboTests
Change-Id: Iffb7874250335db81181b23f96fe7b50a2dd0062
2019-04-19 13:41:22 -07:00
Fan Zhang
33f136fdec
Merge "Fix typo" into qt-dev
2019-04-19 20:32:37 +00:00
Fan Zhang
5d705839f2
Fix typo
...
Bug: 130897882
Test: rebuild
Change-Id: I066b69634214cd25c4acbd173e8fe82cd73d4e97
2019-04-19 13:31:52 -07:00
