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