diff options
| author | 2023-01-06 04:37:02 +0000 | |
|---|---|---|
| committer | 2023-01-06 04:37:02 +0000 | |
| commit | 2c14ef287140506081d27c06d431219f1ddfb80b (patch) | |
| tree | cddbf8228814fc404052b99609655e82d31ad951 /libs/androidfw/FileStream.cpp | |
| parent | 923487178f57a06c76bdf698fe2f28db7aa5b16d (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: I9484aae249fb31244af6b7553f1c091281a08637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions