Merge changes from topic "am-5dcea261cbe84629b91cf97832ba2f2c" into main (d7e3b0dd) · Commits · e / os / android_frameworks_base

Commit d7e3b0dd authored Nov 07, 2023 by Automerger Merge Worker Committed by Android (Google) Code Review Nov 07, 2023

Browse files

Merge changes from topic "am-5dcea261cbe84629b91cf97832ba2f2c" into main

* changes:
  Merge changes I04c68e95,I9ab2b654,Ic0104961 into main am: c0857666 am: 6b96811d am: 1c7456fe
  [automerger skipped] Allow short strings for manifest permissions in @EnforcePermission am: 5b91f32b am: fa8ce651 -s ours am: 658426a6 -s ours

parents e2dab5d3 207889c9

Hide whitespace changes

Inline Side-by-side

Please register or to comment