OSDN Git Service

Merge changes from topic 'port-nfc-vts-AOSP' am: aeb3de7b3f
authorRuchi Kandoi <kandoiruchi@google.com>
Thu, 12 Jan 2017 23:24:08 +0000 (23:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jan 2017 23:24:08 +0000 (23:24 +0000)
am: 3329d00a3a

Change-Id: I328a37e9944c51f63f20bbc8f85b8f9c14a1692e


Trivial merge