summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Yike Zhang <yikezh@google.com> 2022-07-27 09:41:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-27 09:41:27 +0000
commit4fe9a1358f3c2f13982933b028c4ab6fa7828f0d (patch)
tree59865e5411c1e1e71f33d093e818c84530de1a34 /libs/androidfw/AssetsProvider.cpp
parent014bd3ba5393df6e6cf3c5471cd87fb7f7b49b59 (diff)
parentff54042ff900bde970ca328a64bb91705c1b035e (diff)
[automerger skipped] Merge "Add a missing test dependency for UpdatableSystemFontTest" am: d5a3ba9819 -s ours am: 4aa793b88b -s ours am: b72a45c39e -s ours am: ff54042ff9 -s ours
am skip reason: Merged-In Ic1b5b94aabd4c95744109f2cc7443ae04c43b3a6 with SHA-1 5533e7fbb1 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2161996 Change-Id: Ic0eaff8afd2b777da8476fdaa8480ca7b6b3bfa7 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