[automerger skipped] Merge "Implement NfcServiceManager and NfcFrameworkInitializer" am: 7e359a705b am: 941d928575 am: 53c1f02cf2 -s ours
am skip reason: Merged-In Ie11e888cb852740d806d06c0c725bb2a4544e13c with SHA-1 d8c67dd892 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2360420
Change-Id: I967c7ce19b002d4ae59afefe0a35a152574ecfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
067e1ad7e9