TreeHugger Robot
|
a1bd3746e6
|
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: Ic321f309e935c06f785a9ddb9e3e5314ae0f9131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:49:27 +00:00 |
|
Julia Reynolds
|
07fcd1f503
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie868cf81b7b518fdbe90482cd88b8fc2206cf165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:16:23 +00:00 |
|
Automerger Merge Worker
|
c22e3947f5
|
Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev am: d7a04c0467 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ia18251a7a159984c6fcaf9a92cdc169196df1fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 21:27:48 +00:00 |
|
Julia Reynolds
|
0f81ebfda9
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours am: fd60b8f6e2 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Iab57a8f2cde0d209093b57b09816fa594fe25ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 21:26:08 +00:00 |
|
TreeHugger Robot
|
930b2d4907
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours am: 7c6a59f183 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I408bc5e28097b0eee96f9f8eb16b975c9fbe6346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:47:31 +00:00 |
|
Bill Yi
|
5c8af76e32
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours am: 9f71ec4375 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I5e77adbef43aa18efcc5127ff3313653c9c91bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:47:27 +00:00 |
|
TreeHugger Robot
|
8b9d7a3330
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours am: ce7f901993 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I86b674308bc16b69734d3e0482a5293700e08593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:47:15 +00:00 |
|
Bill Yi
|
a53df4df90
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours am: f75cf95c2a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I612c59bd37ed8bada17680d9e950e590570652f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:47:01 +00:00 |
|
TreeHugger Robot
|
17e504f6a8
|
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: Ibfe01c87ea15467a736ccaf7d812c8eaffaefa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:39:38 +00:00 |
|
TreeHugger Robot
|
f02d69dd4f
|
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: I6fcc26d5db647b9c36b743592a8b58dda52b1847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:04:20 +00:00 |
|
TreeHugger Robot
|
d8ca3881ae
|
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1 am: 5d0b8031fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I2d97c089e7da9b2f955bff2f582a5d2fac3606f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:00:30 +00:00 |
|
TreeHugger Robot
|
488b5beb34
|
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6 am: d82f2eae5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: I8340a8631de1e8ac74681042f9139cc2d4385dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:00:23 +00:00 |
|
TreeHugger Robot
|
49e36c9c55
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432 -s ours am: d7b40a08fd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311
Change-Id: I63111ff1df19f3006a54a217556d8bd9482da38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:00:15 +00:00 |
|
Yanting Yang
|
72b8392b23
|
Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev am: bc12caac88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22343650
Change-Id: I1ccf44c2ee3cdcffcd6f1a92eff8409832174cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:00:08 +00:00 |
|
TreeHugger Robot
|
c807f85dc8
|
Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252
Change-Id: I322fad46d2c96858923082030c2bed31884e07ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 19:59:56 +00:00 |
|
TreeHugger Robot
|
e23eed7706
|
Merge "Fix checkcolor_hook error of Settings" into udc-dev am: 535fe83821
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347564
Change-Id: Iab93217fbc909be36122a98482ed8fcc0925a827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 19:59:11 +00:00 |
|
TreeHugger Robot
|
98e2c7dbf0
|
Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477
Change-Id: I48f0c77d0e236249192368bc853d033780d1593e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 19:59:02 +00:00 |
|
TreeHugger Robot
|
a9bb4e14f0
|
Merge "Remove unused listener" into udc-dev am: a99c64dfde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269
Change-Id: I4981fa9180b398f9dbb767e208a83db5461cf3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 19:58:45 +00:00 |
|
Julia Reynolds
|
fc865d217d
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I85c1bcef79fdc660b8302e7e3baae730ff89d63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 19:38:21 +00:00 |
|
TreeHugger Robot
|
5bde972e4e
|
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev
|
2023-03-30 19:08:44 +00:00 |
|
Julia Reynolds
|
9cbd3bdb54
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I0e68d9ee05a4b7fa0a5c38d1ac5138ae4272b2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:57:52 +00:00 |
|
TreeHugger Robot
|
0edd4e2b9a
|
Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311
Change-Id: I3a41df3de7c9766aa1acf631e8db07dcfc823938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:45:13 +00:00 |
|
Bill Yi
|
5caf2a7e4e
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311
Change-Id: I99c5dff5d265acbfead5690311b9bfc3475a6679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:44:59 +00:00 |
|
Julia Reynolds
|
bee2aa0c8b
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I963414b8f0ab062e653ef5d4840d0c048f984144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:10:42 +00:00 |
|
TreeHugger Robot
|
2094e9d0c2
|
Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312
Change-Id: I9d53109132363f5f8bcb3289461efb5abe79f413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:10:32 +00:00 |
|
Bill Yi
|
8452984341
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312
Change-Id: I7d4c3dfad42abb3a98bf9001cccef5f7766dc9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:10:30 +00:00 |
|
Automerger Merge Worker
|
d7a04c0467
|
Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev
|
2023-03-30 18:09:08 +00:00 |
|
Julia Reynolds
|
fd60b8f6e2
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie5eb9b7ca3cc8e0cef4c089d1921f1b172d2a568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:07:36 +00:00 |
|
TreeHugger Robot
|
7c6a59f183
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I8bb2163ceb952297b85e727b263fea044a3df8a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:07:00 +00:00 |
|
Bill Yi
|
9f71ec4375
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: Ica20e5f531ff51bd05a356c0ea985a37ce6157d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:06:56 +00:00 |
|
TreeHugger Robot
|
ce7f901993
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I346438976fefed962e0fff4565c738a594de0ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:06:49 +00:00 |
|
Bill Yi
|
f75cf95c2a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: Ia4371f0ce39c336df758cf2477fb601f717bc100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 18:06:29 +00:00 |
|
Julia Reynolds
|
2a66721ccf
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie50619f573b47b5998b52d2933465e09397124fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 17:37:28 +00:00 |
|
Julia Reynolds
|
f445bb3b32
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie5dfb22c27e0557719ddd96c104f5582f6c14b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 17:36:12 +00:00 |
|
TreeHugger Robot
|
bc1ae98aaf
|
Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810
Change-Id: Icfb9ff53a6d6acf61c2303be1019e48d2ce84d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 17:29:29 +00:00 |
|
TreeHugger Robot
|
5d0b8031fd
|
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I7a12612e6aef131353d1dfbe2c8f4dd86d7b5b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 17:28:36 +00:00 |
|
TreeHugger Robot
|
d82f2eae5c
|
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: I3940fb8e1333d051d12ddb5001717d473bf89d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 17:18:01 +00:00 |
|
Julia Reynolds
|
e4ce644bfe
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I760d7d641cc26d9d640c3504414a16a26d70bc24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 16:57:36 +00:00 |
|
TreeHugger Robot
|
1cd917c2e7
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: Ifa057f10375fc7aca6b547d891885b432ff86724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 16:55:34 +00:00 |
|
Bill Yi
|
d87981f9a5
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: Icf4b8a84abb39d55d9f324e9b0800aeb5876b8d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 16:55:25 +00:00 |
|
TreeHugger Robot
|
32c22fa9a2
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: Iac3c79d71dd698f8980ed4e04cf1d98788c1cca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 16:55:22 +00:00 |
|
Bill Yi
|
fc7bb1a56c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: Iab62e1e02d2ac27033b90fcc15198fb855e7b13a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 16:54:56 +00:00 |
|
TreeHugger Robot
|
64aa2889d1
|
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I5565f72a9d96e5212b2db3b57d9978648596fba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 16:30:30 +00:00 |
|
TreeHugger Robot
|
b3599ae3b6
|
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: Ieb852ea9a7963f0407f7a78e38df0050085ffbfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 16:30:11 +00:00 |
|
Julia Reynolds
|
684952a8b0
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ic239b938c957b82b8eb072ba55b34ab9388a24af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 16:25:15 +00:00 |
|
TreeHugger Robot
|
d7b40a08fd
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311
Change-Id: I26610f2a63c6e192822a93f76c0b20c2f06d787d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 16:20:43 +00:00 |
|
Yanting Yang
|
bc12caac88
|
Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev
|
2023-03-30 15:13:16 +00:00 |
|
TreeHugger Robot
|
3d548d2f2d
|
Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev
|
2023-03-30 15:01:42 +00:00 |
|
TreeHugger Robot
|
535fe83821
|
Merge "Fix checkcolor_hook error of Settings" into udc-dev
|
2023-03-30 14:18:11 +00:00 |
|
Yanting Yang
|
705872ada6
|
Fix checkcolor_hook error of Settings
Bug: 276273674
Test: verify with repo upload
Change-Id: Ia5ba89bb1b491785b953ba7909b3fa7528a0a636
|
2023-03-30 20:51:09 +08:00 |
|