| commit | 8962b00ac4a1bc0b22b51798f9581b3bbeffa2b9 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Nov 30 19:20:58 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 30 19:20:58 2023 +0000 |
| tree | 41ef8bd9dadeab3eebd3a775928a686b81da202d | |
| parent | cc19e96523dd691f43fcd5dd1b35522ea656d86f [diff] | |
| parent | c5d183261061fa99f347bd408811aa9df57bf77f [diff] |
[automerger skipped] Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: e234fe3281 -s ours am: c5d1832610 -s ours am skip reason: Merged-In I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8 with SHA-1 0d11f492f7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2851159 Change-Id: Ia6a89ae2ce3c26529c32c90630b86159384fd4b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>