tree 184ec00ebc95e17c47547c768864d2d9b2780c14
parent eff0aadfba651b95b193b65ee1aef5718dd4c0af
parent f8db421eeb4781f290df2e0d1001c73bf0ba4df3
author Ruchi Kandoi <kandoiruchi@google.com> 1484263714 +0000
committer android-build-merger <android-build-merger@google.com> 1484263714 +0000

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

Change-Id: Ie47f99d7201d92a58dac0808fd36638a3ef82f2f