| commit | d7e3b0dd1284d51ff46e4348066de4f99f47485c | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 07 00:01:37 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 07 00:01:37 2023 +0000 |
| tree | ff7c6e8cce370d67de04523c69ee818a23ff0743 | |
| parent | e2dab5d357546f01a48cd712b5af876585bfa5d5 [diff] | |
| parent | 207889c9e7d5f2b1de18b8cadfacf53ab7ed9368 [diff] |
Merge changes from topic "am-5dcea261cbe84629b91cf97832ba2f2c" into main * changes: Merge changes I04c68e95,I9ab2b654,Ic0104961 into main am: c0857666b7 am: 6b96811d00 am: 1c7456fef4 [automerger skipped] Allow short strings for manifest permissions in @EnforcePermission am: 5b91f32be1 am: fa8ce651e4 -s ours am: 658426a6be -s ours