summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-04-07 13:03:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-07 13:03:31 +0000
commit39ba438e956eca4b78fd01bac1f21fb0c322960c (patch)
tree2f90c4e7e307b23c61e16e0569e3e333b43aa613 /src
parent2f4a9986a7ca2d743d9d3298f47503960b6bbd7c (diff)
parent6917c41735fed9b1628a1d4f7f4a07818949a76d (diff)
downloadNfc-39ba438e956eca4b78fd01bac1f21fb0c322960c.tar.gz
[automerger skipped] Merge "Revert "Do not set default contactless application without user interaction"" am: 6917c41735 -s ours
am skip reason: Merged-In I8e1d67528eca037f4f88380a96f8c542965a1981 with SHA-1 4177b086cf is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1977871 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/2057212 Change-Id: I6c7d1b80835ed6a73564ceca2b0e238b18656bc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions