commit | 70dacafa179677d8fb73fc18ddfa3ae177e8fdca | [log] [tgz] |
---|---|---|
author | Ruchi Kandoi <kandoiruchi@google.com> | Thu Jan 12 23:28:34 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 12 23:28:34 2017 +0000 |
tree | 184ec00ebc95e17c47547c768864d2d9b2780c14 | |
parent | eff0aadfba651b95b193b65ee1aef5718dd4c0af [diff] | |
parent | f8db421eeb4781f290df2e0d1001c73bf0ba4df3 [diff] |
Merge changes from topic 'port-nfc-vts-AOSP' am: aeb3de7b3f am: 3329d00a3a am: f8db421eeb Change-Id: Ie47f99d7201d92a58dac0808fd36638a3ef82f2f