summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-02-08 20:31:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-08 20:31:21 +0000
commit87781f71d7bba75e7bcef92d0f37d560a23d96a4 (patch)
tree95c6ece0967e31d8a8ca0af4b64571d3df5db6d8 /libs/androidfw/AssetManager2.cpp
parent154d9d3aa72752a34afb74c6824d5345c6720084 (diff)
parentde1d8dd1dd3650eb10de875c2a0e5fa434e8b2df (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 149512df23 -s ours am: 07171f20a8 -s ours am: de1d8dd1dd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795498 Change-Id: I89db21cdf725aaccfa33adf2bd4e1b0f1dd2ee0a
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions