diff options
| author | 2023-08-23 13:30:15 +0000 | |
|---|---|---|
| committer | 2023-08-23 13:30:15 +0000 | |
| commit | d5dd48c533c39830e20d5adc7f544d9899f9cbc0 (patch) | |
| tree | dc1a30a1f8b24796a6c76e518912a6ebb8d97158 /libs/androidfw/StringPool.cpp | |
| parent | 210f6adf8a06134991b1d1ec25ca44254610c0f0 (diff) | |
| parent | f40d88261f3bc3638ec62a140bbe68b35ebe4ece (diff) | |
[automerger skipped] Merge "Adds android.permission.REGISTER_NSD_OFFLOAD_ENGINE" into main am: a0ec1987d8 am: 46fdc734de am: 41c590bf2d am: 322cab1407 am: f40d88261f -s ours
am skip reason: Merged-In I15c0196b4cbc6ac7324dcde82119b6e075333936 with SHA-1 8342767381 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2696913
Change-Id: Ifa43334a19b3a01a6c03fdcdf52bc43c8ddd5424
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