summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jean Chalard <jchalard@google.com> 2023-08-31 11:30:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 11:30:34 +0000
commita7a44075a6800e07e8ef23371869f629e600d3c9 (patch)
treecebf5f7ebdb3506f8a04d7e29a1bad666bac51eb /libs/androidfw/AssetsProvider.cpp
parent6ff030bdb761c540d29fd66560f3d8823c44922a (diff)
parent99cae8ff04a57fee76e113c0ad5ffacb4c394958 (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 skip reason: skipped by user sorinbasca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2727194 Change-Id: I5129ef3559a988ddfdf71bada055d7c9ff961c02 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