diff options
| author | 2024-05-22 17:52:59 +0000 | |
|---|---|---|
| committer | 2024-05-22 17:52:59 +0000 | |
| commit | 82b0cb141a5a2f589775772d94d37c25338fbec1 (patch) | |
| tree | 6ac1d3723ccf061dc5efd545fa53d3b65b18a5bd /libs/androidfw/StringPool.cpp | |
| parent | 4eff42b13e80630fb7c0f6e6bd6f12c90ecead74 (diff) | |
| parent | 62364de122f7046853d8ae64c716a2c43c905af3 (diff) | |
[automerger skipped] [conflict] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service am: 95b71ad87d am: 0876fa0374 am: fb7f905851 -s ours am: 62364de122 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27422955
Change-Id: Ia0b279a16a3e0f8d08fcfc054f649ff8582690e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions