Bill Yi
f485e17eb4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d671a4d3f -s ours am: 3695fdacf1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23968429
Change-Id: I6a4bff2e3a384e577ff69084eacfee22895b55f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:54:52 +00:00
Bill Yi
91cd5d37de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ac5600e4ae -s ours am: 3ae666fcc8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23962405
Change-Id: I56cee821561f015c4f9fed01c70bb755b38d9b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:54:37 +00:00
Bill Yi
b5f5fab755
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 582cf66067 -s ours am: 9f22de1bb4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23962405
Change-Id: I7f378f4cf85f02658be5322212051455a10b1f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:54:25 +00:00
Bill Yi
3695fdacf1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d671a4d3f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23968429
Change-Id: I3bfe7a0ed0a2c2a74337046227a0f21e996deb73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:47:38 +00:00
Bill Yi
3ae666fcc8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ac5600e4ae -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23962405
Change-Id: I3d08e936d739301edda681273d45ea379824ef57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:47:26 +00:00
Bill Yi
9f22de1bb4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 582cf66067 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23962405
Change-Id: I09664de539e495362f0dfa5ea8e9afcc09e556bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:47:00 +00:00
Bill Yi
ac5600e4ae
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-07-08 17:48:49 +00:00
Bill Yi
a13ef28d41
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-07-08 17:47:12 +00:00
Bill Yi
f5ba7f1563
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: fa69c12ccf -s ours am: 1ada34392a -s ours am: 423bcd8f09 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I00f8ce0f5920a6b0096ecab12ab80096da39690c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 08:05:48 +00:00
Bill Yi
5e32923cd1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours am: 96b299f598 -s ours am: 18352185b7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I9c4f3ac5d2fe01e5520dcd5a2cab9e7f5c177a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 08:01:51 +00:00
Bill Yi
b161d95648
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours am: 185fcf7f49 -s ours am: 89828a5b6a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: Ibf7d9cd7bb267f68939e2208fbf7666dbea0fc93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 07:56:50 +00:00
Bill Yi
423bcd8f09
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: fa69c12ccf -s ours am: 1ada34392a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I27a283b3e4d8f24b8bc17d60834786612e3e9fd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 07:20:21 +00:00
Bill Yi
18352185b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours am: 96b299f598 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I8beb03dcabdfbcc7fc0d4ceb5839f7b05c32da97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 07:11:31 +00:00
Bill Yi
89828a5b6a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours am: 185fcf7f49 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: Ic8a4a671c466ed34d3c42c928e5bfe79f9634797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 07:05:53 +00:00
Bill Yi
b5c740840c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: 1e11bce1c2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: Ie6a236f45ee2ecd87e760333c828b6dfa20d9b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 06:29:53 +00:00
Bill Yi
1ada34392a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: fa69c12ccf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I92aef852fec8869f09729a02985c8d1871908b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 06:29:23 +00:00
Bill Yi
185fcf7f49
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I1d861f2db818b6dfb2d233487767b6ae4734c2f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 06:26:25 +00:00
Bill Yi
96b299f598
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: Id51df568902f9b24edbe0d404bad511bbd2a0005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 06:26:24 +00:00
Bill Yi
fa69c12ccf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I89189154b2726898efd4b7601a4e04b75d503b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 05:36:14 +00:00
Bill Yi
c94da2c636
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: Ie4ea023a69ff75654d489fb3d8ea2c92215af9c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 05:35:35 +00:00
Bill Yi
1e11bce1c2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I8a94993a380cb3acc9fbaff1ce433d58276a2122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 05:35:23 +00:00
Bill Yi
bd4bc23a25
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I9071edeaea4d07ef36333f37acf5fec64440a9ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 05:10:31 +00:00
Treehugger Robot
fdda517784
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 7eb13387fd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23952757
Change-Id: If9981784de9e08a5b9f46b1d7d1a130a4e791b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 04:32:23 +00:00
Bill Yi
2e9565b7d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 520e4d8ba1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23952757
Change-Id: I20b2e6e3fee49f1da939c6d2f61813e7d3897461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 04:32:01 +00:00
Treehugger Robot
7eb13387fd
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-07-08 04:21:49 +00:00
Treehugger Robot
6a12444366
Merge "Restrict ApnEditor settings" into main
2023-07-07 13:50:42 +00:00
Treehugger Robot
5d183a641e
Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 5da1b03545 am: 135a612034
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723
Change-Id: I238aec0ea5736ad21761bd2af069fb8ab5604bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 12:08:04 +00:00
Treehugger Robot
89889d73d4
Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 20b82c3646 am: 07678daaf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723
Change-Id: I8d284b59c2d74a91e58d1e47eddc86f16ea5ed49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 12:05:39 +00:00
Weng Su
4e18e7414c
Restrict ApnEditor settings
...
- Finish ApnEditor settings if user is not an admin
- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction
Bug: 279902472
Test: manual test
atest -c ApnEditorTest
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-07 20:01:04 +08:00
Treehugger Robot
135a612034
Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 5da1b03545
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723
Change-Id: Ibdc96d4c167f63733093c75262aef945d2f106c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 11:27:09 +00:00
Treehugger Robot
07678daaf7
Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 20b82c3646
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723
Change-Id: I302b91cd8502cca57a28e74cbbf72cf962d6468f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 11:21:28 +00:00
Treehugger Robot
5da1b03545
Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723
Change-Id: I2398f07f2f4936ab26a59a2df285ea3dae05bb94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 10:42:29 +00:00
Treehugger Robot
20b82c3646
Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723
Change-Id: I3536f29c771b9233790e6852ab6dc4cb0b58b531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 10:38:02 +00:00
Chris Göllner
7477fccd0a
Add foldable related controllers to exempt_slice_controller_not_in_xml
...
These controllers cannot be added in XML, as we don't know at compile
time how many there will be.
Fixes: 289967395
Test: N/A
Change-Id: I5b0f6e38937aa6c7d96ac88b6d4cd46c39323ce2
2023-07-07 10:13:15 +00:00
Treehugger Robot
1f9f114495
Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev
2023-07-07 10:02:51 +00:00
Treehugger Robot
f7b9b06013
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 48fef8a8be -s ours am: 16c7483abf -s ours am: 797bd60dde -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I7ee7f1e5f6ef4ef21d57d273856d9a08ef570a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:32:28 +00:00
Taran Singh
01183a2d75
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: bd463821cc -s ours am: 4126d17340 -s ours am: 5f13cb1e2a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I0cd4e0c8646bb892aac53bbfbab4e4296e2c379c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:32:24 +00:00
Treehugger Robot
797bd60dde
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 48fef8a8be -s ours am: 16c7483abf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Id8c790093fe106b292872633275a05d46deb90d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:15:32 +00:00
Taran Singh
5f13cb1e2a
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: bd463821cc -s ours am: 4126d17340 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I32079c08dce661492cab6dfb950b2968904fd6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:15:29 +00:00
Treehugger Robot
45fad2f35d
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 48fef8a8be -s ours am: f3b58bc93e -s ours am: 8026d18a73 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I750cfa6c82c550f30cff40f553fb843ce1f0eaea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:12:07 +00:00
Taran Singh
308edf7b8e
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: bd463821cc -s ours am: 54ad43e475 -s ours am: 6a86c4b452 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Id8c4824aee5930ece8de9e7b0c7efc677c2526c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:12:04 +00:00
Treehugger Robot
b27de2f00e
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 1c4a7c230e -s ours am: 2c27a5c6c7 -s ours am: 148b2c9ceb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I4b0439e421f831eea33b511dbde1fea3a04b6dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:10:49 +00:00
Taran Singh
de456b914b
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: e08dceb2a2 -s ours am: cbe4121297 -s ours am: 36b9438881 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Id8013009a164a37ea0416a3b2c80c4bdc35f62fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:10:45 +00:00
Treehugger Robot
6d71a3430b
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: dc03e2136d -s ours am: 94bbb59134 -s ours am: 662aa53f92 -s ours am: f8f38d6db1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Icdd7c460a6915684aefdf626c1c69db0ec526131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:09:58 +00:00
Taran Singh
58e64d44ed
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: e2e2122c71 -s ours am: 84e2fb4f6a -s ours am: 32dc4dd918 -s ours am: fa8e846501 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Id9267dd43a40d9db0fe30bc93750bbd089df7480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 06:09:53 +00:00
Bill Yi
9d671a4d3f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If55ace5ecb93501f1b1da2ef0db3a71a206c361e
2023-07-06 22:31:41 -07:00
Treehugger Robot
8026d18a73
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 48fef8a8be -s ours am: f3b58bc93e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I7767f4e7f0c2f8643fe097881b8e561d1ea5099a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 05:29:16 +00:00
Taran Singh
6a86c4b452
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: bd463821cc -s ours am: 54ad43e475 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I2c07ecd5a54dd828e9bd3294b4786cc833f5ed02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 05:29:14 +00:00
Treehugger Robot
148b2c9ceb
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 1c4a7c230e -s ours am: 2c27a5c6c7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I9fa098a6f771cedd0c4c19c0c904ef179feda945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 05:28:27 +00:00
Taran Singh
36b9438881
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: e08dceb2a2 -s ours am: cbe4121297 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Ic73a638aa06e7b7f285392fd6cd0d921d6fef27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 05:28:24 +00:00
