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