commit | f8db421eeb4781f290df2e0d1001c73bf0ba4df3 | [log] [tgz] |
---|---|---|
author | Ruchi Kandoi <kandoiruchi@google.com> | Thu Jan 12 23:24:08 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 12 23:24:08 2017 +0000 |
tree | 184ec00ebc95e17c47547c768864d2d9b2780c14 | |
parent | 8d2edad108a6d95048fcdd36da89be725229536a [diff] | |
parent | 3329d00a3adf882b37fd3ae5ab0c3d3d1d82caa2 [diff] |
Merge changes from topic 'port-nfc-vts-AOSP' am: aeb3de7b3f am: 3329d00a3a Change-Id: I328a37e9944c51f63f20bbc8f85b8f9c14a1692e