Automerger Merge Worker
efb5934755
Merge "Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
am: 32d71ab700" into rvc-d1-dev-plus-aosp
2020-03-19 22:57:24 +00:00
TreeHugger Robot
a1205ce199
Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
am: 32d71ab700
...
Change-Id: I9fcc56eb859ba39bfc2c311af6dc1cd76b91d1af
2020-03-19 22:57:20 +00:00
TreeHugger Robot
021a365b12
Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f
am: 123fcc61f7
...
Change-Id: I8da2031b0ab34ebcc167ceac0b8bab1c7ff381c2
2020-03-19 22:57:17 +00:00
TreeHugger Robot
0e40fdfc6e
Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
am: 2fac4fae3a
...
Change-Id: Iaa38091a41e7c45f4dab978b5d5f74276a124d24
2020-03-19 22:57:08 +00:00
TreeHugger Robot
123fcc61f7
Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f
...
Change-Id: I73daeb7b347a75ca9ba17150ccb0e1d15d158872
2020-03-19 22:48:32 +00:00
TreeHugger Robot
2fac4fae3a
Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
...
Change-Id: I3cb785619efbd09712a60a3a1b02cb1265ad7748
2020-03-19 22:47:27 +00:00
TreeHugger Robot
32d71ab700
Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
...
Change-Id: I0d1b386cb8fb5ad18bfe832fe9cee8bdacfbf603
2020-03-19 22:47:21 +00:00
TreeHugger Robot
c4fd9b8d6f
Merge "Add strings for the install app banner in cross profile settings" into rvc-dev
2020-03-19 22:39:31 +00:00
TreeHugger Robot
7be978cd84
Merge "Settings strings for bubbles" into rvc-dev
2020-03-19 22:37:11 +00:00
TreeHugger Robot
ffbf0f432c
Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e
am: 13b129632a
...
Change-Id: I548539c3d32e8b58ebfbe199e1324bb528671ae3
2020-03-19 22:12:25 +00:00
TreeHugger Robot
7c487d23b3
Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e
am: a94808e416
...
Change-Id: Ib606f92ca70fd65a8b90a38bbb518843ed1f8d80
2020-03-19 22:11:34 +00:00
TreeHugger Robot
13b129632a
Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e
...
Change-Id: Iee14e77394977a8b2aafc6249a010fa9b820ca96
2020-03-19 22:11:31 +00:00
TreeHugger Robot
a94808e416
Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e
...
Change-Id: I20b328855032254efc862de8b7fe46f2b78e09fb
2020-03-19 22:11:21 +00:00
TreeHugger Robot
691aa7a05e
Merge "Change cross profile settings page title" into rvc-dev
2020-03-19 22:03:22 +00:00
Michael Groover
835451cb23
Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
am: 4605509b09
...
Change-Id: I6c4cec755acfc931ff083d069101205f1caae039
2020-03-19 21:52:31 +00:00
Varun Anand
49c5126eea
Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
am: 38fc2238bd
...
Change-Id: Iafa49db88cdf8cce56f036efa4e89fb37e4f2ff2
2020-03-19 21:50:55 +00:00
Michael Groover
81020f989d
Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
am: 44c041651b
...
Change-Id: I464c0b36d00f725526fad04715497330e9a557e6
2020-03-19 21:50:35 +00:00
Varun Anand
5f0937286b
Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
am: 742cec9ad4
...
Change-Id: I0058545d4d9fa0cd7d524e8790e885e59208216f
2020-03-19 21:46:23 +00:00
Michael Groover
4605509b09
Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
...
Change-Id: Iddcb73d6300a4563d6ce146c27446d88638f212b
2020-03-19 21:37:41 +00:00
Michael Groover
44c041651b
Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
...
Change-Id: Ic0a0fb5ea9c1e75168bb3ea75d620de2ec1da42f
2020-03-19 21:36:20 +00:00
Varun Anand
38fc2238bd
Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
...
Change-Id: Ia42e358a40f86101ab8f104697861b325fbc3293
2020-03-19 21:36:13 +00:00
Varun Anand
742cec9ad4
Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
...
Change-Id: I3d474eaef339d445550f6d8a7bf99a01123deba0
2020-03-19 21:36:13 +00:00
Michael Groover
0a189b3abe
Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev
2020-03-19 21:31:01 +00:00
Varun Anand
4ebfaec3a3
Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev
2020-03-19 21:21:22 +00:00
Hall Liu
988c14607e
Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
am: f5e8d0662a
...
Change-Id: Iff9a752ba2693f27e7b43e8b2b7c2a218ef5613c
2020-03-19 21:16:12 +00:00
Hall Liu
a81102b92c
Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
am: f0f5796b95
...
Change-Id: Id08966f10e2c84d49b10aafee7d99d35f72c4d24
2020-03-19 21:11:44 +00:00
Hall Liu
f0f5796b95
Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
...
Change-Id: I9224f80e87ab21b00ce78427c093b5b686c9ddea
2020-03-19 21:09:09 +00:00
Hall Liu
f5e8d0662a
Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
...
Change-Id: I5493831165ec966b30221669bd3d154a880271e5
2020-03-19 21:08:47 +00:00
Hall Liu
64e48c2061
Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev
2020-03-19 21:06:54 +00:00
Peter Wang
9009179333
Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
am: 13dd87a9b8
...
Change-Id: Ieace1b8da5732c6634e10e1e39f0d959bb81566f
2020-03-19 20:46:10 +00:00
Peter Wang
13dd87a9b8
Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
...
Change-Id: Iac656249241c2b5fe3c74f9accfc84b7195cc153
2020-03-19 20:29:16 +00:00
Peter Wang
b3bf9454eb
Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
am: e85186f38e
...
Change-Id: Ic3caa8e7ff348e9a6caf22431d33e92706dfa5e4
2020-03-19 20:17:01 +00:00
Mady Mellor
1f54e84c3c
Settings strings for bubbles
...
To be used in a follow up..
Test: treehugger
Bug: 151965589
Change-Id: I1a285d0eb827eed33d9dcca2ec6e2be2ef098185
2020-03-19 13:16:36 -07:00
Peter Wang
e85186f38e
Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
...
Change-Id: I904e10cf91836c1d25d6b318dff364185f5a796f
2020-03-19 20:16:15 +00:00
Peter Wang
6c95bb5cf6
Merge "[API Review] APIs in SubscriptionManager" into rvc-dev
2020-03-19 20:07:39 +00:00
kholoud mohamed
48db1a2b0d
Add strings for the install app banner in cross profile settings
...
Bug: 151920866
Test: N/A
Change-Id: Ib0cf7e437952211ce929c1eba763dc8ed54793e6
2020-03-19 20:04:31 +00:00
Sarah Chin
b556a1c812
[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c
-s ours am: 13ee012dce
-s ours am: 6930e2adc0
-s ours
...
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 20974b6814
is in history
Change-Id: I69c26ed50fa24369c146a6f382fa9ff9c5996ff6
2020-03-19 19:43:17 +00:00
Sarah Chin
44fad38f1b
[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c
-s ours am: 13ee012dce
-s ours am: 1a37fd26fa
-s ours
...
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee
is in history
Change-Id: Ic80faddb5bfb1beaf7ee505f9fa98ce2c2740897
2020-03-19 19:36:49 +00:00
Sarah Chin
6930e2adc0
[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c
-s ours am: 13ee012dce
-s ours
...
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee
is in history
Change-Id: Idb067bc391a46440b1cbd2ae3662a1f41cb8270c
2020-03-19 19:27:51 +00:00
Sarah Chin
1a37fd26fa
[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c
-s ours am: 13ee012dce
-s ours
...
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee
is in history
Change-Id: I7f1af1f1a2c55c7014bf0ef0400feae78bf1d399
2020-03-19 19:27:28 +00:00
TreeHugger Robot
2945c75162
Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78
am: 88f17b2ce9
...
Change-Id: If3ff9412fe9126aeeb04a7aedec62f03417c58a8
2020-03-19 19:25:11 +00:00
Sarah Chin
13ee012dce
[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c
-s ours
...
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee
is in history
Change-Id: Id17d3ac372de1dd6385a674a8e72cf935a531696
2020-03-19 19:24:55 +00:00
TreeHugger Robot
22aedc6715
Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78
am: 866a77ee75
...
Change-Id: I839715e256ea325108a0d0d56ac08eacb9acb1a1
2020-03-19 19:24:49 +00:00
Sarah Chin
bd8bbca27c
Merge "5G meteredness for telephony framework" into qt-qpr1-dev
2020-03-19 19:11:00 +00:00
TreeHugger Robot
866a77ee75
Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78
...
Change-Id: I65b7710a4b1d71ac9cd9571f57ea7a1992160716
2020-03-19 19:09:00 +00:00
TreeHugger Robot
88f17b2ce9
Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78
...
Change-Id: I455f43c98d738412ba87a67193189827f851dff7
2020-03-19 19:08:47 +00:00
TreeHugger Robot
635c0e7f78
Merge "Add Ethernet Tethering settings" into rvc-dev
2020-03-19 18:54:12 +00:00
Anna Trostanetski
801123eb47
[automerger skipped] Merge "Show only listUIChanges instead of all" am: c305df9450
am: 983158e9ab
-s ours am: 73fdbebfcc
-s ours
...
am skip reason: Change-Id I5b461b33484a38d0c6a5b7bf7e928231dd662668 with SHA-1 74117346a6
is in history
Change-Id: I2927f47712ee615fc80a469da09048bb98956510
2020-03-19 18:09:07 +00:00
Anna Trostanetski
73fdbebfcc
[automerger skipped] Merge "Show only listUIChanges instead of all" am: c305df9450
am: 983158e9ab
-s ours
...
am skip reason: Change-Id I5b461b33484a38d0c6a5b7bf7e928231dd662668 with SHA-1 74117346a6
is in history
Change-Id: I07e913d115710757c59c5fd7ab2a7ee7f59790e9
2020-03-19 18:00:03 +00:00
Anna Trostanetski
983158e9ab
Merge "Show only listUIChanges instead of all" am: c305df9450
...
Change-Id: Ic3c11a30e28d91aebd5b15d6b601f12294a13a8b
2020-03-19 17:51:32 +00:00