summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Jean Chalard <jchalard@google.com> 2023-08-31 10:43:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 10:43:12 +0000
commit99cae8ff04a57fee76e113c0ad5ffacb4c394958 (patch)
tree70a3c516bede75ecb115d3028cd087e8ecfbb93e /libs/androidfw/AssetManager2.cpp
parentea55c653784d88c3c44ac80f92da4d2df6525e8f (diff)
parentfa89e38faca494ad855552737257fb07c6c800c4 (diff)
[automerger skipped] Merge "Remove deprecated NMS methods from V" into main am: 0dfbd68f76 -s ours am: fa89e38fac -s ours
am skip reason: skipped by user sorinbasca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2727194 Change-Id: Id2c4e1bba5951ae7bb1e5a12fffaf0efb2e2dbd9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions