tree 2144322e46fc4f52873016f896f8896d0751b570
parent 158ad45f0923ab1311ce51d5dfe3b19d9f68aa1e
parent 1ba5f6745ae86d5b2356be122494d4a1281d4758
author Justin Yun <justinyun@google.com> 1522307986 +0000
committer android-build-merger <android-build-merger@google.com> 1522307986 +0000

[automerger skipped] Merge "Use default libnfc-nci.conf if not found in vendor/etc" into pi-dev
am: 1ba5f6745a  -s ours

Change-Id: Ibbdbf560909f5624e559f26ccd988aa91d933b93