From: Ruchi Kandoi <kandoiruchi@google.com>
Date: Thu, 12 Jan 2017 23:24:08 +0000 (+0000)
Subject: Merge changes from topic 'port-nfc-vts-AOSP' am: aeb3de7b3f
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f8db421eeb;p=android-x86%2Fhardware-interfaces.git

Merge changes from topic 'port-nfc-vts-AOSP' am: aeb3de7b3f
am: 3329d00a3a

Change-Id: I328a37e9944c51f63f20bbc8f85b8f9c14a1692e
---

f8db421eeb4781f290df2e0d1001c73bf0ba4df3