commit | ac577c68b8b49a380e53a056718f31c328171ded | [log] [tgz] |
---|---|---|
author | Jean Chalard <jchalard@google.com> | Wed Aug 30 16:02:33 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 30 16:02:33 2023 +0000 |
tree | 6ba2fede923f2bf1669273cebfa79a02b9fa7561 | |
parent | e6b01afc2b409404ae8e379bff949f731a37e6da [diff] | |
parent | 9cae9fbb5c7a3cec7fd32badf7f0ab8342d7181d [diff] |
[resolved conflict] Merge "Remove deprecated NMS methods from V" into main am: 0dfbd68f76 am: a0258a23e2 am: 69f70c517b am: 7e97c44464 am: 9cae9fbb5c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24593225 Change-Id: I420b34403fbbf92ebd78b7f439eb95b8447984f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>