OSDN Git Service

Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52 am: 67d3257519
authorRuchi Kandoi <kandoiruchi@google.com>
Thu, 6 Jul 2017 23:16:19 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 23:16:19 +0000 (23:16 +0000)
am: a404bfb348

Change-Id: Ieae4a4211b18a03e81068b39948dbfd18272df3d


Trivial merge