Merge "Parse extras bundles from NFC tags" into tm-dev am: 866cd169bf am: c2ad79882c am: 7f944e3673 am: 62ba56607d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188208 Change-Id: Ide94eb257bcb0998b31df20ca1310f55ec1de709 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: