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