| commit | c5d183261061fa99f347bd408811aa9df57bf77f | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Nov 30 19:02:06 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 30 19:02:06 2023 +0000 |
| tree | 1992d74976f273743a9b91f89e5a75dfe7a5927b | |
| parent | ac2f252ec8c8357cb7573717f91cc69f84350c2f [diff] | |
| parent | e234fe32816606af69622f00cab1c45cd9cc2430 [diff] |
[automerger skipped] Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: e234fe3281 -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: I5b74c83ddceb3367f619c761734ccf7a576be9b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>