summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Kholoud Mohamed <kholoudm@google.com> 2022-05-05 09:27:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-05 09:27:32 +0000
commit28218e2b738de1528da42b74b128305a8f39792f (patch)
tree9e674feed2cb9c0a9c497fe21b5ccec99c51bb86 /libs/androidfw/AssetsProvider.cpp
parent7323898ea1ea07613fe39fdbed40cbfa17979b3d (diff)
parent0a10b8cc8bf28ff6c6c57838acb2fa9fd7eba175 (diff)
Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324 Change-Id: Idc981dae0f9e4880fff383d8872df98107070f83 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions