OSDN Git Service

Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev am: 5cb8f220a8
authorLove Khanna <love.khanna@nxp.com>
Fri, 7 Jul 2017 02:35:31 +0000 (02:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 02:35:31 +0000 (02:35 +0000)
am: 83a4419e46

Change-Id: I7725724e65f6306ba5d4d4b048dd69b38c2ca5a0


Trivial merge