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