tree c711e22e042f2de2d69ab4cfa2f1fd4952624dc3
parent dfbd44c17ad4a807f7d568fd0d8bac14becc22c4
parent e04ee5e4913bb180c4bb4757328c74a366ab5a2b
author Treehugger Robot <treehugger-gerrit@google.com> 1590790348 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590790348 +0000

Merge "Improve NFC availability for active UIDs" am: 12bf06acfa am: e04ee5e491

Change-Id: I1bdda0fcb3d3fe35fdc9f4101bc85e00b2d04c7c