| commit | 8ed669d5ec6d23ddce817ea156c0a673a86e2844 | [log] [tgz] |
|---|---|---|
| author | Joshua Trask <joshtrask@google.com> | Mon Dec 04 20:37:42 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 04 20:37:42 2023 +0000 |
| tree | 4caa989463304a767794870e5ed143c0fa953577 | |
| parent | 1b4f4f41d66cf8bb2d4757776879d172e00d15d1 [diff] | |
| parent | 3d98943800d3f59a93936f803e314c441dd59eba [diff] |
Merge changes from topic "nfc-custom-chooser" into main * changes: Introduce CustomChoosers API for NFC resolver. Grant SHOW_CUSTOMIZED_RESOLVER permission to Shell Create new SHOW_CUSTOMIZED_RESOLVER permission