summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Alex Johnston <acjohnston@google.com> 2022-06-27 18:27:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-27 18:27:07 +0000
commit6107812d47ed2486b79006a57e08eeced48566d6 (patch)
tree7f8ad8362bfaec2d8f4dfd146e6c06483876ae1b /libs/androidfw/StringPool.cpp
parent48fbc80789341552e2e0554fc4ec2887e525ea72 (diff)
parent36c0b2d1464588db211ab8992dc1525163454121 (diff)
Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7ec am: 36c0b2d146
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034752 Change-Id: Iab524e7ab8bba033093c3a1aeb52d88f79e23581 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