Merge changes from topic "am-ef6b8ecc97fe4fe3b5b64faebe66e7b5" into udc-qpr-dev-plus-aosp

Browse Source

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 38280de428 -s ours am: 3daa00eee5 -s ours am: df0234a563 -s ours am: 1a80da1dba -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: e11d0e8502 -s ours am: 6c693471db -s ours am: fc49acca28 -s ours am: 47a3ce177b -s ours

...

This commit is contained in:

Automerger Merge Worker

2023-07-12 13:28:36 +00:00

committed by Android (Google) Code Review

parent b461bc7934 4832b1dc04

commit 546e9558f9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available