diff options
| author | 2023-01-06 05:22:46 +0000 | |
|---|---|---|
| committer | 2023-01-06 05:22:46 +0000 | |
| commit | dab39266797d0867b272a23a6f9caebf1dc29d80 (patch) | |
| tree | f1f061594af51b70e7727303a3eaa713a47afa49 /libs/androidfw/ConfigDescription.cpp | |
| parent | 3e5cdcbda7c005c9055109152373042c646d8a76 (diff) | |
| parent | c43faf12a8f876b6f77fb3681b5ad81adbc34e6d (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: a637f18876 -s ours am: abd233fd88 -s ours am: 2c14ef2871 -s ours am: c43faf12a8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20850158
Change-Id: Id69ac711bf325e697a5f49a9ce6da062ffdcf145
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