diff options
| author | 2024-07-24 15:47:26 +0000 | |
|---|---|---|
| committer | 2024-07-24 15:47:26 +0000 | |
| commit | 8e8fa8b2121907e804d7506453d3760dcbbb37fb (patch) | |
| tree | a1778ea9d580637ad15b854ddde9a97c9f577cd8 /tools/aapt2/ResourceParser.cpp | |
| parent | 1b1652d4f0eae5c273a719717b82c646e7ad07a8 (diff) | |
| parent | d6dc4967aacc0ee6b61943f02fdef365eb8b02ef (diff) | |
Merge changes from topic "nfc_main_merge" into aosp-main-future
* changes:
Eliminate boilder plate code for recovering service in NfcAdapter
Add Test method to inject HCE data
[framework] Add a flag for nfc persist log.
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions