diff options
| author | 2022-10-28 06:51:43 +0000 | |
|---|---|---|
| committer | 2022-10-28 06:51:43 +0000 | |
| commit | 29e2ce4c639ed02cf99c5435c275eb632d9fb51f (patch) | |
| tree | ca3a78b923351a2f4e388e31ffe473bbef3ac089 /libs/androidfw/AssetsProvider.cpp | |
| parent | adf28175f70c325c1b060c0f9cb11f2d71318bfd (diff) | |
| parent | 84ead264f82d3a2d0713e2f821e2d2c524da142c (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev am: 191036a989 am: 70536c0199 -s ours am: bdf427e3a0 -s ours am: b4b3e02753 -s ours am: e7ab5c3f24 -s ours am: 1d806d66fe -s ours am: b7356c1c84 -s ours am: 84ead264f8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219
Change-Id: I05858df82bb7493433f76c46a2d9f21004dd95b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions