TreeHugger Robot
78cb42e359
[automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc -s ours am: 2e2693f6dc -s ours am: eab00379c2 -s ours
...
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931
2020-04-14 08:50:11 +00:00
TreeHugger Robot
a7ce10082c
[automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc am: 34fa84add8 -s ours am: 281e2158bd -s ours
...
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931
2020-04-14 08:49:42 +00:00
TreeHugger Robot
eab00379c2
[automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc -s ours am: 2e2693f6dc -s ours
...
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931
2020-04-14 08:30:59 +00:00
TreeHugger Robot
281e2158bd
[automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc am: 34fa84add8 -s ours
...
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931
2020-04-14 08:29:39 +00:00
TreeHugger Robot
2e2693f6dc
[automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc -s ours
...
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931
2020-04-14 08:07:46 +00:00
TreeHugger Robot
34fa84add8
Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc
...
Change-Id: I323cc1221d8182de32dba59ae57b476d82726e3c
2020-04-14 08:06:28 +00:00
TreeHugger Robot
09600dd8cc
Merge "Merge lastest test case from master" into rvc-dev
2020-04-14 07:32:21 +00:00
TreeHugger Robot
f1f7a9ca8b
Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: edd104d2da am: 1285d456b9 am: 89d4e74177
...
Change-Id: Iaea1732b9f245732e716cf2f5f4120bf538cb074
2020-04-14 06:21:21 +00:00
Raff Tsai
7baddeebeb
Merge lastest test case from master
...
Bug: 152716522
Test: atest com.android.settings.tests.perf
Change-Id: If5913440b4a4b58662c195e8cb637804fd6f2449
Merged-In: Ia504dd1185de1d33a21fec344871d4b0fabae953
2020-04-14 06:06:28 +00:00
TreeHugger Robot
89d4e74177
Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: edd104d2da am: 1285d456b9
...
Change-Id: I8244526d7b7fc9076b88d678a41ddacb5045b7be
2020-04-14 06:03:30 +00:00
TreeHugger Robot
db3acc09c3
Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: fdca63ecb0 am: a03356a425
...
Change-Id: If6bbdfcefedd1968ebb1a87ceefefe5e009c26d5
2020-04-14 06:01:30 +00:00
TreeHugger Robot
74f9846f36
Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: edd104d2da am: 5d45d1c001
...
Change-Id: Id319da34ef5820b7622b67899b34ffce957141fb
2020-04-14 06:01:12 +00:00
TreeHugger Robot
a03356a425
Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: fdca63ecb0
...
Change-Id: I732f4e3826f732d49ea85fb020002899ef0bc3a2
2020-04-14 05:44:20 +00:00
TreeHugger Robot
1285d456b9
Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: edd104d2da
...
Change-Id: I975d44262eb464eeb30f438a2afdddf1c5644297
2020-04-14 05:44:20 +00:00
TreeHugger Robot
5d45d1c001
Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: edd104d2da
...
Change-Id: I6ae5bd8a9c8f3857d123823262baa1730bbc590e
2020-04-14 05:42:50 +00:00
TreeHugger Robot
fdca63ecb0
Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48
...
Change-Id: I8cbabd9853355c78fb04fc26b55f05de8ab83470
2020-04-14 05:22:56 +00:00
TreeHugger Robot
edd104d2da
Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48
...
Change-Id: I6a262175556f5b8e858cb47ed55ef7966a1ad654
2020-04-14 05:21:34 +00:00
TreeHugger Robot
f25450ef48
Merge "Fix indexing error of mobile related controllers" into rvc-dev
2020-04-14 05:04:46 +00:00
tim peng
f25c1ffa79
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev am: 765b71b9e8 am: 7e20068916 am: b39b61ec55 am: 89db263afd
...
Change-Id: Id75a094765984d48777f907980ac9913beb55e65
2020-04-14 04:31:54 +00:00
tim peng
89db263afd
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev am: 765b71b9e8 am: 7e20068916 am: b39b61ec55
...
Change-Id: I1fb308f6af9951e955143eb53fd2a6a2191ea60a
2020-04-14 04:09:35 +00:00
tim peng
9716338dfd
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev am: 765b71b9e8 am: 1125768f19 am: 2060c4bc91
...
Change-Id: Ib281e87a9a6de08e7ae5cafc0554afb2c24fee2f
2020-04-14 04:08:30 +00:00
tim peng
4431af9316
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev am: 765b71b9e8 am: 7e20068916 am: cbc6848340
...
Change-Id: Icdc8c596ec5e26f101950c64d60d6e4a2f264edd
2020-04-14 04:08:13 +00:00
tim peng
2060c4bc91
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev am: 765b71b9e8 am: 1125768f19
...
Change-Id: Iadb4b812a2de91c05fe47a33973adec93fb76222
2020-04-14 03:49:02 +00:00
tim peng
b39b61ec55
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev am: 765b71b9e8 am: 7e20068916
...
Change-Id: I801db1fcbf67ade3abdb25737fdf4a00c9967610
2020-04-14 03:48:44 +00:00
tim peng
cbc6848340
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev am: 765b71b9e8 am: 7e20068916
...
Change-Id: I33a01cd47211538338f47cb5d185abc9ab6b34d8
2020-04-14 03:47:16 +00:00
tim peng
20be866ba8
Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 3d75454911 am: 495a9a3816 am: a4bdcf2475
...
Change-Id: If60ad3eecf21a519adf56f426f778258c402bf82
2020-04-14 03:28:27 +00:00
tim peng
1125768f19
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev am: 765b71b9e8
...
Change-Id: Ie666f66f4bf46510ceddd7c16193c07d4bca6fb5
2020-04-14 03:28:09 +00:00
tim peng
7e20068916
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev am: 765b71b9e8
...
Change-Id: I7a913f81cfd9544b8c341c3be161d435ea27009b
2020-04-14 03:26:44 +00:00
tim peng
765b71b9e8
Merge "Tapping on Play media can have up to a 1 minute delay" into rvc-dev
2020-04-14 03:10:16 +00:00
tim peng
8fb8af0b93
Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 90f68fdd24 am: 7bc9b3a89a
...
Change-Id: I777df759200596ff5df38fe22171e1ee24851dd5
2020-04-14 03:04:38 +00:00
tim peng
a4bdcf2475
Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 3d75454911 am: 495a9a3816
...
Change-Id: Icc0c06e35c2ea5d698591c6540e793421ef51bc2
2020-04-14 03:03:51 +00:00
tim peng
7b33d011e1
Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 3d75454911 am: 2105141fe8
...
Change-Id: I174c263de5bd8ce7676a2e81939b97aad48c44ef
2020-04-14 03:03:32 +00:00
tim peng
7bc9b3a89a
Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 90f68fdd24
...
Change-Id: Ieccd043407e20b3fd5909ede95fa50800b52da84
2020-04-14 02:48:29 +00:00
tim peng
495a9a3816
Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 3d75454911
...
Change-Id: Ic6898a2f807047f0c14b8b2723bb29b0acb7cc18
2020-04-14 02:41:10 +00:00
tim peng
2105141fe8
Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 3d75454911
...
Change-Id: I7df4aa4d8145c5ef509c412cfa0da2015fdf95a2
2020-04-14 02:39:37 +00:00
tim peng
90f68fdd24
Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2
...
Change-Id: I3f28423a9741e3bd375955749bd621c587345057
2020-04-14 02:19:26 +00:00
tim peng
3d75454911
Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2
...
Change-Id: Idceeb2afec57dc26bc9407e4f8d37bfc0aba7c3e
2020-04-14 02:18:00 +00:00
tim peng
2c9d412ba2
Merge "Output switcher subtitle modification" into rvc-dev
2020-04-14 01:56:06 +00:00
TreeHugger Robot
e615aa6acd
Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6 am: 4d865d9304 am: 0b4a8f3e65 am: 350ec4956e
...
Change-Id: Iae1d31e02da3c12fb1ca7d81f5eff0952efe0e37
2020-04-13 14:47:50 +00:00
Julia Reynolds
e0593134dc
Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3 am: 9768e4417b am: 122e878967 am: 6e1aec5231
...
Change-Id: Ia4991ca33d7784e520a5a3530c8dbd0deed11f96
2020-04-13 14:47:43 +00:00
TreeHugger Robot
cab9975854
Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6 am: c09a33101c am: 1d14e1cd42
...
Change-Id: I8291aca71a6b66249c0b892c9ab7404026e4e14c
2020-04-13 14:23:26 +00:00
Julia Reynolds
0aba996688
Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3 am: a4fe9e7b6f am: 93fd474883
...
Change-Id: Ie0a2edba9bfc58cac35457f1a0706009d3e9544d
2020-04-13 14:23:20 +00:00
TreeHugger Robot
c9e5fad6ba
Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6 am: 4d865d9304 am: ccc96fe3f0
...
Change-Id: Ifb47aeb341532e742d35e1e909e5ca1720efdf9e
2020-04-13 14:23:12 +00:00
Julia Reynolds
66fb753d4d
Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3 am: 9768e4417b am: eec2578f16
...
Change-Id: I1e4b5cd1422282ba43efd0ac7d7bbe914d6f6910
2020-04-13 14:23:05 +00:00
TreeHugger Robot
350ec4956e
Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6 am: 4d865d9304 am: 0b4a8f3e65
...
Change-Id: Ie633c54e846f2b57fbe786053d5b033e1f3d018c
2020-04-13 14:21:33 +00:00
Julia Reynolds
6e1aec5231
Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3 am: 9768e4417b am: 122e878967
...
Change-Id: I435f96797d9e876fee234ef0b28ceca0abd9df26
2020-04-13 14:21:26 +00:00
TreeHugger Robot
0b4a8f3e65
Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6 am: 4d865d9304
...
Change-Id: I7fe8970f9ad9ba501ddb01af1d137096dc818717
2020-04-13 14:05:01 +00:00
TreeHugger Robot
1d14e1cd42
Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6 am: c09a33101c
...
Change-Id: I49b4ae897085feba5b1e5f144fb56826258fa04e
2020-04-13 14:04:59 +00:00
Julia Reynolds
122e878967
Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3 am: 9768e4417b
...
Change-Id: I483273b6b747ecfe24871e6fe004375ba8c899fa
2020-04-13 14:04:54 +00:00
Julia Reynolds
93fd474883
Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3 am: a4fe9e7b6f
...
Change-Id: I613774fad753d2e54068917998906afe1b1bc15a
2020-04-13 14:04:51 +00:00
