OSDN Git Service

Merge "NFC DTA Integration am: b54567810f -s ours am: 3cf0b6926f -s ours am: 58a611...
authorLove Khanna <love.khanna@nxp.com>
Sat, 22 Jul 2017 01:24:23 +0000 (01:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 01:24:23 +0000 (01:24 +0000)
am: 07fa7b4603  -s ours

Change-Id: I6da6be57576ad6aeb0a315879a95e82aa79f2b06


Trivial merge