diff options
| author | 2023-01-06 05:07:53 +0000 | |
|---|---|---|
| committer | 2023-01-06 05:07:53 +0000 | |
| commit | 1d2556fca0d23dcc3d7d016a752e4d5a6d53545d (patch) | |
| tree | 369a343baddabe1d06e0a5953179ca9ad241e8d4 /libs/androidfw/ResourceTimer.cpp | |
| parent | 735ae3669d8b85675ad863fa83b8e73b68037ed0 (diff) | |
| parent | 3d96cd6e6da6482a1d894a6ae7ff49583ab0f08f (diff) | |
[automerger skipped] Merge "Revert "Trim the activity info of another uid if no privilege"" into tm-dev am: 3d96cd6e6d -s ours
am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20251403
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20828778
Change-Id: Ic15aad4a806908c69230a969190f0923ca8e98da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions