diff options
| author | 2021-12-27 17:50:37 +0000 | |
|---|---|---|
| committer | 2021-12-27 17:50:37 +0000 | |
| commit | f12c70b8b271ef9d5453453aff1d31fbf213d755 (patch) | |
| tree | e332aa4b5b2f3ae0a943d333346edee7e0964194 /libs/androidfw/StringPool.cpp | |
| parent | 11c1481daa4a7a9f54cd3f9ec8ff25dcd05f309e (diff) | |
| parent | fcd72a8d05163fd1671e799145692f10b54165c4 (diff) | |
[automerger skipped] Merge "Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de82 am: 34bf6a82d6" into sc-v2-dev am: fcd72a8d05 -s ours
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 d732692ba7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16524353
Change-Id: Iad90195d9286458f84b2910139076294db8a85b8
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions