OSDN Git Service

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

Change-Id: I77202532d60368ebc18e754a5454eb6fa1b0e5dc


Trivial merge