Forked from
Dhina17 / platform_frameworks_base
5470 commits behind the upstream repository.
Treehugger Robot
authored
[automerger skipped] Merge "nfc(api): Dont invoke enableReaderMode from setDiscoveryTech" into main am: 41413d8e am: 5a647716 -s ours am skip reason: Merged-In Id6a5e865cd69bafcf2e0dcfafe104aee3330f138 with SHA-1 c1eec317 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3093126 Change-Id: Ie0257ecbf4be13d85c4a764428eae5f74d2292cf Signed-off-by:Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>