[automerger skipped] Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: da05498175 am: ac2f252ec8 -s ours

Browse Source

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>

...

This commit is contained in:

Roshan Pius

2023-11-30 19:20:26 +00:00

committed by Automerger Merge Worker

parent 2f4ff23d05 ac2f252ec8

commit cc19e96523

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available