Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
am: 29dd0bf796
am: 6b83876c1e
am: aef49ffac7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036 Change-Id: I1326dd1ca85e5269e726cd7784729824582ca79e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: