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