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

Browse Source

* changes:
  [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: 23eb92c4ba -s ours am: 06ac924785 -s ours am: 773ffcdc3d -s ours am: 30585305f3 -s ours
  [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: fa6de7b263 -s ours am: 3bcf0a8dd5 -s ours am: 64301079f7 -s ours am: 47cd7ab12b -s ours

...

This commit is contained in:

Automerger Merge Worker

2023-07-12 13:30:16 +00:00

committed by Android (Google) Code Review

parent cbd1e8ab72 310a61d382

commit cbd6b1175d

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