diff options
| author | 2021-11-12 02:27:14 +0000 | |
|---|---|---|
| committer | 2021-11-12 02:27:14 +0000 | |
| commit | bb3d8639813e8957338556b39e3774f712144a9b (patch) | |
| tree | e34efbca1f41ace5409fd204bcf5b9f03eba7670 /libs/androidfw/StringPool.cpp | |
| parent | d2fe89c26262336cbfb5c6c82d1cdd0c9b0c4f71 (diff) | |
| parent | 105a34a7f320a02e68b754ad5e4a47c32daa7588 (diff) | |
Merge "[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: c7052c9c79 -s ours am: bb535c95d2 -s ours am: 734bde2baa -s ours am: e8e382c03f -s ours" into sc-v2-dev-plus-aosp am: 105a34a7f3 -s ours
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 07e7aaff29 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241253
Change-Id: Id9e667e35efbebef703c5a75e484320065fae84e
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions