diff options
| author | 2023-02-22 18:26:41 +0000 | |
|---|---|---|
| committer | 2023-02-22 18:26:41 +0000 | |
| commit | df9776c730d342ab2d84a7f68ba7e79a55ed562a (patch) | |
| tree | 310fd9a83d79e49cac42e112ac2d2bd9d3b039fb /tools/aapt/Command.cpp | |
| parent | 9bb072843a6e2b6a0a03183eac833b6f3d895586 (diff) | |
| parent | f6fb227c2cda46cac27f4be97df0ccb8e43152ce (diff) | |
[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into sc-v2-dev am: b70d57a0ef -s ours am: e14be8b3d5 -s ours am: 8aa05a4f38 -s ours am: f6fb227c2c -s ours
am skip reason: Merged-In I666b9ee6b6076766513b97e675fdbaa002428601 with SHA-1 6d848929ea is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21398181
Change-Id: I4608adf831909f040ab92d95a61cca67035da67c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/Command.cpp')
0 files changed, 0 insertions, 0 deletions