summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Yike Zhang <yikezh@google.com> 2022-07-27 09:21:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-27 09:21:10 +0000
commitff54042ff900bde970ca328a64bb91705c1b035e (patch)
tree45bf269e37f1e968e50fef6598ace0c3702f3953 /libs/androidfw/AssetsProvider.cpp
parentf763c2a8eab1429e73649fd33dc110cec37226bb (diff)
parentb72a45c39ebf6b3fc461227610a4fd5bc61c4ad9 (diff)
[automerger skipped] Merge "Add a missing test dependency for UpdatableSystemFontTest" am: d5a3ba9819 -s ours am: 4aa793b88b -s ours am: b72a45c39e -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: Id6787a95c154110bafc19d48e18b157e8c88cd91 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