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