Merge changes from topic 'port-nfc-vts-AOSP'

am: aeb3de7b3f

Change-Id: Idabefc3d91da9e152d82a12b4723f1a5f1f127c2
This commit is contained in:
Ruchi Kandoi
2017-01-12 23:19:30 +00:00
committed by android-build-merger

Diff Content Not Available