Bill Yi
|
c6218e804c
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I95240338e7c0f74596a448907a71b7b9b8b6914a
|
2022-04-07 00:04:23 +00:00 |
|
Chaohui Wang
|
ea23179bc9
|
Merge "Fix cannot add language" into tm-dev am: 65c610c2ab am: d5d380f9c0 am: edf16b89a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527
Change-Id: Ic05f5cad545f01b117c33ae978612b01806c8707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 12:13:24 +00:00 |
|
Chaohui Wang
|
edf16b89a8
|
Merge "Fix cannot add language" into tm-dev am: 65c610c2ab am: d5d380f9c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527
Change-Id: I7d6975f131708ab29abe580916ad1cb6ac29fc0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 11:51:32 +00:00 |
|
Chaohui Wang
|
4786d1f869
|
Merge "Fix cannot add language" into tm-dev am: 65c610c2ab am: 20032a4b13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527
Change-Id: Ifc0e1bcc96a628b05a3b0b3e5414d0cc05e7ba72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 11:51:09 +00:00 |
|
Chaohui Wang
|
d5d380f9c0
|
Merge "Fix cannot add language" into tm-dev am: 65c610c2ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527
Change-Id: Id5fdb67e9eccb3b7a55f56025452b67db5bad854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 11:30:32 +00:00 |
|
Chaohui Wang
|
20032a4b13
|
Merge "Fix cannot add language" into tm-dev am: 65c610c2ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527
Change-Id: I1f427300d8ee35d800c102efa1c58bf2cf6a58f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 11:29:19 +00:00 |
|
Chaohui Wang
|
65c610c2ab
|
Merge "Fix cannot add language" into tm-dev
|
2022-04-05 11:04:10 +00:00 |
|
Chaohui Wang
|
8a44aafeb1
|
Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d am: 1b78e1b36c am: 71e6b6f628
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374483
Change-Id: Icc9b48041380a16c94b39e8684f7ae8e2b1d40da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 10:06:15 +00:00 |
|
Chaohui Wang
|
63ddb79c0d
|
Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d am: 9734698f71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374483
Change-Id: I45fa8dca8c1f449741876191f62727de3040925b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 08:51:10 +00:00 |
|
Chaohui Wang
|
71e6b6f628
|
Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d am: 1b78e1b36c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374483
Change-Id: Id60cb8ec6abbc6c6deefedf8e21084a246d18666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 08:50:55 +00:00 |
|
Chaohui Wang
|
1b78e1b36c
|
Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374483
Change-Id: I751dd866452c17271fdafd6ea7e00098aa2c783d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 08:37:54 +00:00 |
|
Chaohui Wang
|
9734698f71
|
Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374483
Change-Id: I119d33ca9d3fa7345fb2f5efbc6a7c0327da0d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-05 08:36:58 +00:00 |
|
Chaohui Wang
|
bab799899d
|
Fix Flicker for ZenCustomRuleSettingsBase
Fix the following flicker on pages under:
Notifications -> Do Not Disturb -> Schedules -> [One Schedule]
1. Do Not Disturb behavior
2. (1) -> Create custom settings for this schedule
3. (2) -> Calls
4. (2) -> Messages
5. (2) -> Display options for hidden notifications
6. (4) -> custom
Fix: 226523115
Test: On Pixel Phone
Change-Id: Ief9963091847d58654f26851616563ae910716a5
|
2022-04-04 22:22:10 +08:00 |
|
Yuri Ufimtsev
|
d1b7ba7c3e
|
Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 am: 8ef0f87dcc am: 42689d0381
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17504393
Change-Id: I88cb1916dd273786963f13e011cf936353fd5471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-04 11:57:37 +00:00 |
|
Yuri Ufimtsev
|
42689d0381
|
Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 am: 8ef0f87dcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17504393
Change-Id: Ia8f86fce06aa6f09c1d86fb122afc91c67fdced2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-04 11:15:59 +00:00 |
|
Yuri Ufimtsev
|
109d101511
|
Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 am: e2dd5d9fdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17504393
Change-Id: I1ad92f2bc0c0cd807061bc6598e773c6b2f5a767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-04 11:15:46 +00:00 |
|
Yuri Ufimtsev
|
8ef0f87dcc
|
Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17504393
Change-Id: Id2297d013f4730d1dbd8fe2f8d00febc2a4e8846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-04 10:53:52 +00:00 |
|
Yuri Ufimtsev
|
e2dd5d9fdd
|
Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17504393
Change-Id: I3391b16ed53e2a573235b57d25dabfd206eb46ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-04 10:52:48 +00:00 |
|
Yuri Ufimtsev
|
d191a16c54
|
Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev
|
2022-04-04 10:33:09 +00:00 |
|
Chaohui Wang
|
f03f79b145
|
Fix cannot add language
Fix: 227972634
Test: manual
Change-Id: I3382879e51238be55687072eeb07bb553dafc952
|
2022-04-04 11:26:55 +08:00 |
|
Xin Li
|
6a43641f59
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours am: 524cba9409 -s ours am: 18bb0d8a59 -s ours
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189
Change-Id: I1b605fa3a6bfa80012656252915ff1106f548f19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 09:38:51 +00:00 |
|
Xin Li
|
18bb0d8a59
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours am: 524cba9409 -s ours
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189
Change-Id: I72af492a695d41c82f0aaec187512c54b6625ba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 09:08:42 +00:00 |
|
Xin Li
|
033da0ca50
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours am: 7f998a1b5b -s ours
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189
Change-Id: I032051d9ce433c30ac206428dfbd35363f10e8b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 09:00:28 +00:00 |
|
Xin Li
|
524cba9409
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189
Change-Id: Ic5173d033f850f519783db24f8ab09f03789b356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 08:30:48 +00:00 |
|
Xin Li
|
7f998a1b5b
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189
Change-Id: If8a994473492cd2acc448c32d7e73e8685e00048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 08:29:33 +00:00 |
|
Xin Li
|
444e9d38f6
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189
Change-Id: I590cbcebf55205c055cc235d52247e1903fab8a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 07:43:39 +00:00 |
|
Xin Li
|
35cf5330a9
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189
Change-Id: I28301ae9c1fc09fe18a0d0ce0e2eaa9586f04657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 07:11:38 +00:00 |
|
Yuri Ufimtsev
|
d16c12b9ac
|
Set up correct ComponentName for test mode of Parental Controls
Test: manual
Bug: 222339681
Change-Id: I9c141b8f04a69c914a55ed176c2f1c101d22a34c
|
2022-04-01 21:28:07 +00:00 |
|
Xin Li
|
e75d9ee3e9
|
Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I50e3649c21bb83ee9130fa98a71560fe261198a9
Change-Id: I2a97159d0de32a6262bbace7bb82b09897447bdb
|
2022-04-01 20:32:46 +00:00 |
|
TreeHugger Robot
|
dfb59f8d71
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours am: 9f87ce1cbd -s ours am: a0ee5881ee -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I4721c73d57276fffcbc68a039895dea6d8dc58bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 20:22:18 +00:00 |
|
TreeHugger Robot
|
a0ee5881ee
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours am: 9f87ce1cbd -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I1911ffb0d984907ebe88769299ed57a3a4515d95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:56:00 +00:00 |
|
TreeHugger Robot
|
73ee5341f3
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours am: 63acc6e862 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: Ib5698862b9de359e31c635cb97844dcf6b24f575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:55:29 +00:00 |
|
TreeHugger Robot
|
969ee22d41
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: b41a74c1a9 -s ours am: d3fdbf5def -s ours am: 99fed064c3 -s ours am: bd52c5eba8 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I39f41cb388332b5a148bafa4bcd227d5e2611eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:48:43 +00:00 |
|
TreeHugger Robot
|
9f87ce1cbd
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I5c2b69ec2c780d5059ca2777909d439b71fb61e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:33:54 +00:00 |
|
TreeHugger Robot
|
63acc6e862
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: Ic52110a7caa0d4a5f5f22ae5337750d86c0e30d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:33:02 +00:00 |
|
TreeHugger Robot
|
bd52c5eba8
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: b41a74c1a9 -s ours am: d3fdbf5def -s ours am: 99fed064c3 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I155513591a95536bde86aa4924785dda58f6206f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:26:36 +00:00 |
|
TreeHugger Robot
|
ee41654bb0
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: b41a74c1a9 -s ours am: d3fdbf5def -s ours am: 6241bbab73 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: Id5a4ce06e223c37de0cc346d39119ae272893331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:19:11 +00:00 |
|
TreeHugger Robot
|
cf96e65a6f
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I7bac3a571de92ee247cbdc6dc60454da472175c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:18:35 +00:00 |
|
TreeHugger Robot
|
99fed064c3
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: b41a74c1a9 -s ours am: d3fdbf5def -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: If816802fc170e71be42443def8565b27d6b78d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:04:28 +00:00 |
|
TreeHugger Robot
|
6241bbab73
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: b41a74c1a9 -s ours am: d3fdbf5def -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I9a1b99bd103319b645efb01ec754a850896904a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:03:30 +00:00 |
|
TreeHugger Robot
|
b3e3a33a3e
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I45a103b233c117cd88564ff7c7dc594d446e6cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 19:02:55 +00:00 |
|
TreeHugger Robot
|
3f74c5175f
|
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55 am: bb5466b1f8 am: 1c36a9ff0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: I6ffa79aa553c49b4cceacf60c37071e865746d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 18:55:45 +00:00 |
|
TreeHugger Robot
|
6d9631779d
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I19f3ca5069da1b3bcce1e50583b06f5f6e0d2fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 18:41:57 +00:00 |
|
TreeHugger Robot
|
d3fdbf5def
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: b41a74c1a9 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I171f729159e3093bb8d317feaab681c889fc0db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 18:41:55 +00:00 |
|
TreeHugger Robot
|
1c36a9ff0c
|
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55 am: bb5466b1f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: I0fb81a009d71d312f7707fafbd625678d5e5f2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 18:28:50 +00:00 |
|
TreeHugger Robot
|
8eacc8a8dc
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I8a0e31ec51c4a133b2f4842d47f818461f9e712b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 18:27:04 +00:00 |
|
TreeHugger Robot
|
b41a74c1a9
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I6b0a4bc63732cb838bac6d6d16625ca44f6ba4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 18:26:08 +00:00 |
|
TreeHugger Robot
|
542d772b1b
|
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55 am: 2571882ab4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: I5e6bce9dd2f4a2d18fd3916636293b8173f7da54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 18:12:07 +00:00 |
|
TreeHugger Robot
|
7bd23716c3
|
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I3f91cd3600b1b581beac0b262a35cbf66fed209e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 18:03:28 +00:00 |
|
TreeHugger Robot
|
bb5466b1f8
|
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: Ib9c9b6702b9d7f541debd2b9f0677590d8e3149f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-01 17:57:10 +00:00 |
|