diff options
| author | 2023-01-06 04:36:29 +0000 | |
|---|---|---|
| committer | 2023-01-06 04:36:29 +0000 | |
| commit | 74bece198be5b82dfb4c4ecde089d696fe334aa9 (patch) | |
| tree | 369a343baddabe1d06e0a5953179ca9ad241e8d4 /libs/androidfw/ResourceTimer.cpp | |
| parent | 7653fbf9e0bdff4d8592c4cd67bc34eb28c27153 (diff) | |
| parent | abd233fd889a12b32242fea1ece5ff92e6dac6fe (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20850158
Change-Id: Id18562ae971a61f7772a823f78a60bf382bb396a
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