commit | 3329d00a3adf882b37fd3ae5ab0c3d3d1d82caa2 | [log] [tgz] |
---|---|---|
author | Ruchi Kandoi <kandoiruchi@google.com> | Thu Jan 12 23:19:30 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 12 23:19:30 2017 +0000 |
tree | 184ec00ebc95e17c47547c768864d2d9b2780c14 | |
parent | 93eda4d82a4615d889ec270c261ebb321ba3090d [diff] | |
parent | aeb3de7b3f6b8193337d123353a332ec8c72f46e [diff] |
Merge changes from topic 'port-nfc-vts-AOSP' am: aeb3de7b3f Change-Id: Idabefc3d91da9e152d82a12b4723f1a5f1f127c2