Automerger Merge Worker
a4b5755d8a
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: 319842707c am: efdf695e5f
...
Change-Id: I7278d17db63faefc6d1372d74f2324f2d6aba124
2020-03-12 19:59:31 +00:00
Automerger Merge Worker
eee15b09e6
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 am: 1032548a02 am: 5a1575a54d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4953923933e1a9e4584ce9778a377b14ef0cd610
2020-03-12 19:49:17 +00:00
Automerger Merge Worker
b269f2eb3a
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 am: 624b3e089d am: 4c2c0c442c
...
Change-Id: I519c3c5c54f7a0afca3b5093d28cfc43c860655b
2020-03-12 19:48:13 +00:00
Zhen Zhang
0ad0a50538
Merge "Log some actions for changing wifi hotspot config" into rvc-dev
2020-03-12 19:47:42 +00:00
Automerger Merge Worker
55b85a3f6f
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: 999977ff27 -s ours am: 3b07b65009 -s ours am: 65f2bf3070 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7eadaceab63edc8b55a484856051599fec45e353
2020-03-12 19:46:57 +00:00
Automerger Merge Worker
b6848b1a03
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 1b2cdfc1e0 -s ours am: 506585dd49 -s ours am: 989bf746f4 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2685b2400073129ac3a010d6e98b0e7c9b19b30b
2020-03-12 19:46:05 +00:00
Automerger Merge Worker
0962b120d2
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: bde8ce85e0 am: 31b91d9a9f am: f5543f6661 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6028dbcb3e3b37ed6febf2cba912eee03961b5ed
2020-03-12 19:44:51 +00:00
Automerger Merge Worker
a206bf1ae6
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c am: 391beafa9b am: c1f47778fa -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6cc3aa94c56f3bde77264f88074fc94b39389260
2020-03-12 19:44:50 +00:00
Automerger Merge Worker
ef8c0d5464
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours am: 9b8c326fe8 -s ours am: 07c95b0b35 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7c618f4b57b70cb1b787a2885775f0980b0a52bc
2020-03-12 19:43:28 +00:00
Julia Reynolds
a7a44fe058
Remove nested scrolling
...
Test: manual
Fixes: 151334452
Change-Id: I4d2f5eb268cda1e1a19187e2812fa026f44484f9
2020-03-12 15:20:39 -04:00
Automerger Merge Worker
046c46f073
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 75166350e2 am: 5b1ea14640
...
Change-Id: If1619991aa322bb8c490990cd1360f8f8fe00b36
2020-03-12 18:52:38 +00:00
Automerger Merge Worker
c299b60577
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: 2c01f26e38
...
Change-Id: I3611389ba2ee752a9564f1051caee069928e48af
2020-03-12 18:33:45 +00:00
Automerger Merge Worker
496773632f
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: f63c3aca11
...
Change-Id: I702990ba79769646b5390f1d490c67bfbc3d88c6
2020-03-12 18:30:30 +00:00
Automerger Merge Worker
5b1ea14640
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 75166350e2
...
Change-Id: Ifa995555e94b1f106b6222dcb663ff71bb712809
2020-03-12 18:14:43 +00:00
Automerger Merge Worker
2c01f26e38
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22
...
Change-Id: If098a49eba7d3f7cee8495afd3a71d0e8bd01c80
2020-03-12 18:12:00 +00:00
Automerger Merge Worker
f63c3aca11
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22
...
Change-Id: I47e5c577bfa338ac3160ee8c4274717ed40cb26f
2020-03-12 18:09:32 +00:00
Automerger Merge Worker
05017ca458
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: 60b59c3a56 am: 67e5d0e911 am: 7baff55fd5
...
Change-Id: I53ec5ff4e27fc97b36336db03062e85178086a68
2020-03-12 18:01:41 +00:00
Automerger Merge Worker
9eead478cf
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: fd8934f348 am: 7ca652e32e am: d142acd3f8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I770b8d67e2aab5304348473a26adcf4fe1478ef1
2020-03-12 18:01:29 +00:00
Automerger Merge Worker
6bfc90ea6c
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 8dfa636433 am: f7e7def0a4 am: 0b883269c2
...
Change-Id: Ia6abe26b22ad4facd8de3cb258f7cba5fb1e7648
2020-03-12 18:00:38 +00:00
Automerger Merge Worker
009b355435
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: d4fd92c566 -s ours am: 3bc2ed9708 -s ours am: 4a0ba4a702 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib420cec8a5adb3a7cf6a52fd5987ebb1390b9718
2020-03-12 18:00:03 +00:00
Automerger Merge Worker
b536bd149d
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 99eedee50f -s ours am: d782d88e5e -s ours am: c225b1ffcd -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib44e790d9fa92e9bc361ed802607797a3a72106d
2020-03-12 17:59:17 +00:00
Automerger Merge Worker
ec03f7feb2
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: 751daad079 am: c79de6aa02 am: 2ab475efff -s ours
...
am skip reason: subject contains skip directive
Change-Id: I44dc900265a78e7ae5d7f8b6262b999d5e6512f6
2020-03-12 17:57:55 +00:00
Automerger Merge Worker
ab8a93c842
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: da93669044 am: 5d79efa587 am: d809fcc3a1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Idc8e097d512f32dce95d7a761bab847c4134372b
2020-03-12 17:57:53 +00:00
Automerger Merge Worker
b03770fb79
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: 08aec12201 -s ours am: 55f5ffbd04 -s ours am: d6c3db13c7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I568d7df5a825bdedec7c27311ec750541f9bb71e
2020-03-12 17:57:05 +00:00
Automerger Merge Worker
ecd0bf51c4
Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 am: 311510b298 am: af76dea7d0 am: 5beca05a95
...
Change-Id: Ie29c74da74d44e638a812105191fb571d4e9ceac
2020-03-12 17:56:50 +00:00
Automerger Merge Worker
74552f3ab1
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 am: b9b0dd9bc5 am: a6829d80b2 am: d914509538
...
Change-Id: I1f540bdb8e2374622f5d1eff59f12e7a6fbbe9dd
2020-03-12 17:56:41 +00:00
Automerger Merge Worker
efdf695e5f
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: 319842707c
...
Change-Id: I411939166f74bda489e60338e2d66a414d68f6a7
2020-03-12 17:56:33 +00:00
Automerger Merge Worker
5a1575a54d
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 am: 1032548a02
...
Change-Id: I10b6662e2bc9d5eb102da4c2bd9fd2874ada2efb
2020-03-12 17:56:24 +00:00
Automerger Merge Worker
4c2c0c442c
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 am: 624b3e089d
...
Change-Id: Ic22420de4178591dc4777e98e0586b5ae3bc6b33
2020-03-12 17:56:15 +00:00
Automerger Merge Worker
65f2bf3070
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: 999977ff27 -s ours am: 3b07b65009 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577
2020-03-12 17:56:07 +00:00
Automerger Merge Worker
989bf746f4
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 1b2cdfc1e0 -s ours am: 506585dd49 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577
2020-03-12 17:55:56 +00:00
Automerger Merge Worker
f5543f6661
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: bde8ce85e0 am: 31b91d9a9f
...
Change-Id: Iff3e56d49b9efca9f5a26a84e331d025aefc7583
2020-03-12 17:55:21 +00:00
Automerger Merge Worker
c1f47778fa
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c am: 391beafa9b
...
Change-Id: I66190ededed6a3c34dc887b389b743e2c89c3201
2020-03-12 17:55:18 +00:00
Automerger Merge Worker
5beca05a95
Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 am: 311510b298 am: af76dea7d0
...
Change-Id: I146aa0e0bae31f453b8e2b326ea832581a6f71dc
2020-03-12 17:53:50 +00:00
Automerger Merge Worker
d914509538
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 am: b9b0dd9bc5 am: a6829d80b2
...
Change-Id: I6fc9961db5584868d792824086711f2b4d412c6a
2020-03-12 17:53:44 +00:00
Automerger Merge Worker
9469b91a22
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30
...
Change-Id: Iedfb2e19dfd12a5f6be25be28556d0d1fbc95def
2020-03-12 17:53:36 +00:00
Automerger Merge Worker
75166350e2
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30
...
Change-Id: I9c14c035b88153c86a4c027e54fef5989f167a89
2020-03-12 17:53:31 +00:00
Automerger Merge Worker
07c95b0b35
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours am: 9b8c326fe8 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
2020-03-12 16:58:29 +00:00
Automerger Merge Worker
af76dea7d0
Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 am: 311510b298
...
Change-Id: I68c04709fd0a3a200eb402070a7556b95dbc8292
2020-03-12 16:57:35 +00:00
Automerger Merge Worker
a6829d80b2
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 am: b9b0dd9bc5
...
Change-Id: Ie0816f485e3f25778ab913f4cf5cb82bcded70aa
2020-03-12 16:57:29 +00:00
Automerger Merge Worker
319842707c
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514
...
Change-Id: I4c096d5162f1f33254319aefe020d019d164c890
2020-03-12 16:52:59 +00:00
Automerger Merge Worker
1032548a02
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458
...
Change-Id: I7ff717a072afb0b6e9351c2ba66b876b4f7b61d7
2020-03-12 16:52:26 +00:00
Automerger Merge Worker
624b3e089d
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009
...
Change-Id: I310b2d8699bf34e29ba16de6849c1a98b3cb92e0
2020-03-12 16:52:17 +00:00
Automerger Merge Worker
3b07b65009
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: 999977ff27 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577
2020-03-12 16:51:31 +00:00
Automerger Merge Worker
506585dd49
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 1b2cdfc1e0 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577
2020-03-12 16:51:04 +00:00
Automerger Merge Worker
31b91d9a9f
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: bde8ce85e0
...
Change-Id: Ie7f73d3599572b12b432ded791a89563ef489317
2020-03-12 16:50:13 +00:00
Automerger Merge Worker
391beafa9b
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c
...
Change-Id: I6e1448ada55f09c0010226f03a1ba8a9c5dff08b
2020-03-12 16:50:11 +00:00
Automerger Merge Worker
9b8c326fe8
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
2020-03-12 16:49:16 +00:00
Automerger Merge Worker
7baff55fd5
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: 60b59c3a56 am: 67e5d0e911
...
Change-Id: Ib19c16bf8882a7a40921ece5e58965509e2d9246
2020-03-12 16:39:31 +00:00
Automerger Merge Worker
d142acd3f8
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: fd8934f348 am: 7ca652e32e
...
Change-Id: I13a80cf8769689fe58715a076348731ad7f5b021
2020-03-12 16:39:22 +00:00
