tree 66abc9b362456b5cc31dd40a96399dc76153c6a9
parent 7ef11ffc25d238fba2503efadd2499f52e39c44e
parent 9a70eefde03457c7e2812abd307d813dc6d24eb8
author Treehugger Robot <treehugger-gerrit@google.com> 1592907600 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592907600 +0000

Merge "Clean up device/generic/common/nfc/libnfc-nci.conf usages" am: 724dd47c7b am: 9a70eefde0

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1347083

Change-Id: I3652d6615edc687e99f2554f8286e7d91388e979