Automerger Merge Worker
c73177f8d2
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: b90e48ad64 -s ours" into sc-v2-dev-plus-aosp
2021-07-30 14:33:27 +00:00
TreeHugger Robot
e29ba0a2cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: b90e48ad64 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430931
Change-Id: I056c501bfa980764b42806d977cad074ba2b8a6a
2021-07-30 14:33:17 +00:00
Bill Yi
efb958f5e1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 96d40908e0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I92d423f5cd1acf0b03c8a51d7a4decfe16109983
2021-07-30 14:33:16 +00:00
TreeHugger Robot
a9daea74f6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: 3c987fd2ba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430931
Change-Id: I6c1e922ebffee81fc15513144af34c7a6d44e52f
2021-07-30 14:33:03 +00:00
Bill Yi
36b2149d9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 54f684bdda -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I7e8de43464c598b5948302c4e10b4072e353cdf0
2021-07-30 14:32:47 +00:00
TreeHugger Robot
9655248eee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: 243ae3b151 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430931
Change-Id: I5ced467458ac2c06fb50d85630279b6d50eecbf7
2021-07-30 14:32:41 +00:00
TreeHugger Robot
9afbaf6aac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 57d9cf9f25 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428747
Change-Id: Ieeb2b8736fdaa52386321a83a5c23c404af8b8a0
2021-07-30 14:32:25 +00:00
Bill Yi
54f684bdda
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I91104e537f92974876be8d590f01db23257fdb48
2021-07-30 14:21:12 +00:00
Bill Yi
2487eee891
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I4851fff1d80fbbd507ac78300bed7ae7141d2271
2021-07-30 14:21:09 +00:00
TreeHugger Robot
fb5770bc84
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-07-30 14:18:43 +00:00
Bill Yi
96d40908e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: If220aa9eb626e85a6123ed5b84d99c370facd66e
2021-07-30 14:17:31 +00:00
TreeHugger Robot
3c987fd2ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430931
Change-Id: I4d9300322d9114de041eb032258911b97f5438ff
2021-07-30 14:17:22 +00:00
TreeHugger Robot
7c5c51ee97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b6417453f9 -s ours am: f06cd4b190 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430932
Change-Id: I2f1dceb1311bb7f717282d9ce63460d9351b5d2a
2021-07-30 14:16:41 +00:00
Bill Yi
16693aaca0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I472c9c04799848a0382c2af447d442b73bad4bd0
2021-07-30 14:16:37 +00:00
TreeHugger Robot
243ae3b151
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430931
Change-Id: I7a7ac84fbdc83e0e2b7facfe8a157a82282d0cd0
2021-07-30 14:16:34 +00:00
TreeHugger Robot
b90e48ad64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430931
Change-Id: I536a95a89ff1243f1e87e340b923564f70e7c190
2021-07-30 14:15:47 +00:00
TreeHugger Robot
57d9cf9f25
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-30 14:15:01 +00:00
TreeHugger Robot
f06cd4b190
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b6417453f9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430932
Change-Id: Iec241bd1f714d52e7ae2fd432bb85b660ae75a6b
2021-07-30 14:08:18 +00:00
TreeHugger Robot
7399e2deaa
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-30 14:07:33 +00:00
TreeHugger Robot
b6417453f9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-07-30 13:53:31 +00:00
Bill Yi
2e4581a30c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7a3af5b6e872561b010ea6cee172ebd3d6ab8f7
2021-07-30 12:10:45 +00:00
Bill Yi
63c32865cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I66bde249f1f3d460a40ccd3fb9daf61f7be202dd
2021-07-30 12:06:46 +00:00
Bill Yi
7461d69a41
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic7691c918342532cfe3cb14c2d454760c81e7dd1
2021-07-30 12:02:35 +00:00
Bill Yi
296d41309e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e84b422b86e7195aac236b569828f1a0760ad7e
2021-07-30 11:53:32 +00:00
Bill Yi
99ef4ec5fb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iab11c36fd772ae3aefc76bf063199db279be2450
2021-07-30 11:42:43 +00:00
Bill Yi
e5d2e077c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c108f50853f1de14c4df8d52bdcc4211f05278b
2021-07-30 11:39:05 +00:00
TreeHugger Robot
9c3d69b209
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: bc39d7f73e am: 19f6e4a49e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I1fba8ff17af4db969a068abbead3e5f456480a3e
2021-07-30 08:56:00 +00:00
TreeHugger Robot
37e5684696
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: f39f9d2d3d am: 91abd1277d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I88825778dedfa6b9f2203aa63e8f2ea87b008f98
2021-07-30 08:55:49 +00:00
TreeHugger Robot
19f6e4a49e
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: bc39d7f73e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I3de6a6e268a713517b5a29cbc15a7abe87844f5c
2021-07-30 08:45:31 +00:00
TreeHugger Robot
91abd1277d
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: f39f9d2d3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I40408cecd02422f1fa41ece7f160637294d172ca
2021-07-30 08:44:57 +00:00
TreeHugger Robot
db1a226c54
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: f719dd7a6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I5c79b7f727031f97222fa628b8865aaf2cc31a5c
2021-07-30 08:44:43 +00:00
TreeHugger Robot
f39f9d2d3d
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I3587d9793b6e62402603f2d0a7ffa66c62704b9b
2021-07-30 08:32:41 +00:00
TreeHugger Robot
f719dd7a6c
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: Iede0416114c004a9f66c8a93fdd05cd22d53ff26
2021-07-30 08:32:02 +00:00
TreeHugger Robot
bc39d7f73e
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: Ic9337fe64ae71afa60bbe6d8e3ef4a2a511b6cd9
2021-07-30 08:30:58 +00:00
TreeHugger Robot
74060d3158
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev
2021-07-30 08:18:01 +00:00
Ahan Wu
a551ea537c
Use new api to create InteractionJankMonitor.Configuration.Builder
...
The api to create InteractionJankMonitor.Configuration.Builder has
changed, adopt the new api.
Bug: 170708749
Test: build pass
Change-Id: I627370fed43630750eab2ec9752338fb03753463
2021-07-29 19:22:54 -08:00
Treehugger Robot
c71af48782
Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9 am: 9cfd6a6164 am: bd71ddc59b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501
Change-Id: If1d8252f6641658af7be154ebdbe118db2a9e92a
2021-07-30 03:15:07 +00:00
Treehugger Robot
bd71ddc59b
Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9 am: 9cfd6a6164
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501
Change-Id: I9d3f933e3fa5c68e34e97f9b4191022c5d0aee8b
2021-07-30 03:00:43 +00:00
Treehugger Robot
9cfd6a6164
Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501
Change-Id: I9966577fec0160fb4c13cde9cfcf7bf8d7b5697d
2021-07-30 02:45:06 +00:00
Treehugger Robot
f5876a1df9
Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501
Change-Id: I818ae58baa161689a867cea8bc4662db602dfdcb
2021-07-30 02:35:23 +00:00
Treehugger Robot
060bf953e3
Merge "Fix memory leak in TopLevelBatteryPreferenceController"
2021-07-30 02:18:11 +00:00
Joe Bolinger
e4509b1cc9
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc am: 21ef1830ea am: 6cab6458d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: If0687c468eb91a1a3d78bb2d4283d35b45016850
2021-07-30 02:04:54 +00:00
Joe Bolinger
a69d97a6e6
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc am: 769447a502 am: 24a3796f7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I189313c9eaf6d05fa5b06872f1b8c51056094255
2021-07-30 02:04:28 +00:00
Joe Bolinger
6cab6458d6
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc am: 21ef1830ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I9980fa2cbaabec648590902df007d21ab1c7f893
2021-07-30 01:50:43 +00:00
Joe Bolinger
24a3796f7c
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc am: 769447a502
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I264232763f7e0af216291368ae5f704942f12ad7
2021-07-30 01:50:19 +00:00
Joe Bolinger
0e4f451cc1
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc am: cd50557c3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: Idb9a72ae857be801a8f74fe75da0d2d91b09c171
2021-07-30 01:49:56 +00:00
Joe Bolinger
769447a502
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: If88427e1b7ed4d5227c821ab65e47f52cc9c5481
2021-07-30 01:36:43 +00:00
Joe Bolinger
cd50557c3f
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: If4c0396b8b89dae066a9c44f4adc31f14139e7a7
2021-07-30 01:36:02 +00:00
Joe Bolinger
21ef1830ea
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I4c5dd9f9a73e7bc83d8e5c0ccf90358f8bdc8383
2021-07-30 01:35:07 +00:00
Joe Bolinger
12e161d1dc
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev
2021-07-30 01:21:55 +00:00
