tree 0231b4636bf66e6b364c623eb4d7977da1988e96
parent 617949b8b7da6600d2b73ae33fe238fd6a6c3ec1
parent 70dacafa179677d8fb73fc18ddfa3ae177e8fdca
author Ruchi Kandoi <kandoiruchi@google.com> 1484267951 +0000
committer android-build-merger <android-build-merger@google.com> 1484267951 +0000

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

Change-Id: I65754671dac41c4257e1d0926c0a8cdc3aae8921