OSDN Git Service

Merge "NFC DTA Integration am: b54567810f -s ours am: 3cf0b6926f -s ours am: 58a611...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Sat, 22 Jul 2017 01:13:50 +0000 (01:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 22 Jul 2017 01:13:50 +0000 (01:13 +0000)
commit07fa7b4603e0672fdfd10e4928b6fe75ba64232f
treede67997338b470db915e4e00ca25540f7ba1e554
parent38b86cfc5a0ca3490f04487b97b0623e9f65f03e
parent37d1565dfa2adb4e15da6a088651c85cf9ca797b
Merge "NFC DTA Integration am: b54567810f  -s ours am: 3cf0b6926f  -s ours am: 58a611b3a2  -s ours" into oc-mr1-dev-plus-aosp