diff options
| author | 2023-01-06 03:28:50 +0000 | |
|---|---|---|
| committer | 2023-01-06 03:28:50 +0000 | |
| commit | a637f1887669e3b8c883f763ebc3c16e34626e62 (patch) | |
| tree | cb99779ec8aebbab4bcfdbbc53964a9ebff2d43e /libs/androidfw/ConfigDescription.cpp | |
| parent | 56be1fc3c4bbee3bdf5c63d842223291fbbdd8a7 (diff) | |
| parent | 5c6e0c3fe54a3a3149dca551c47220d4d2ab762f (diff) | |
[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into qt-dev am: 1d1446d53b am: 438e63bcac -s ours am: a7dce649b5 -s ours am: 3abf3b4e63 -s ours am: e96853e79c -s ours am: 5c6e0c3fe5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20850158
Change-Id: Icd896fc979beb503ab8bc2affdfd4360ae195a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions