summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jean Chalard <jchalard@google.com> 2023-08-31 13:05:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 13:05:44 +0000
commitf05569fca78a5884aebd9a6ced102e6a1ad6185b (patch)
tree571420b4cefb7d91f023fd9a5429e50df9430643 /libs/androidfw/AssetsProvider.cpp
parentb0ee70822cb81017ba7c784d7a29f88cc13cbc5f (diff)
parentc6024af78d34c24e7569d78ae4ebafe9d41f216a (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: c6024af78d -s ours
am skip reason: skipped by user sorinbasca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2727194 Change-Id: Iccc9358deb3520396015af74aef4645d3fcd6c3d 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