summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jean Chalard <jchalard@google.com> 2023-08-31 12:06:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 12:06:36 +0000
commitc6024af78d34c24e7569d78ae4ebafe9d41f216a (patch)
tree0bb2d56cf4577bac9db0a0778c616dc8ba73cf7d /libs/androidfw/AssetsProvider.cpp
parente018eb4e7d7a7ded26a0c9fa831baeca49c560d0 (diff)
parenta7a44075a6800e07e8ef23371869f629e600d3c9 (diff)
[automerger skipped] Merge "Remove deprecated NMS methods from V" into main am: 0dfbd68f76 -s ours am: fa89e38fac -s ours am: 99cae8ff04 -s ours am: a7a44075a6 -s ours
am skip reason: skipped by user sorinbasca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2727194 Change-Id: Ia7d1e408d538420b1ac3db0e9a0f3fe353c962d8 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