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

Browse Source

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 000cdf1b5d -s ours am: 1dafc2d68b -s ours am: 7a8357ca00 -s ours am: ca8e3aaf62 -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours am: 2482176dc9 -s ours am: 49d0d9ffe5 -s ours

...

This commit is contained in:

Automerger Merge Worker

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

committed by Android (Google) Code Review

parent c9e16ad2c2 185c0a0bfc

commit b461bc7934

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