summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Kholoud Mohamed <kholoudm@google.com> 2022-11-30 10:41:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-11-30 10:41:12 +0000
commitbed1828b844067f8a77c5f10e412d4d96add296f (patch)
treeb772e97e156523164d7945e59b0bebe33bc8ecad /libs/androidfw/AssetsProvider.cpp
parent71c5fa90cad6b413876e107699309380e9f99e56 (diff)
parent43fb625fd87328b9beb86c540f3196b6900d34ee (diff)
Merge changes Idb1d2d27,I60837e40
* changes: Migrate lock task policy APIs to coexistence Call device policy engine from DPMS
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions