OSDN Git Service

Merge changes from topic 'fix_configure_chip' into oc-dev
authorNingyuan Wang <nywang@google.com>
Thu, 27 Apr 2017 01:13:52 +0000 (01:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Apr 2017 01:13:52 +0000 (01:13 +0000)
am: 5eca115b68

Change-Id: Ice788fc3d3c9226fa47df0b598927ea4a349332e


Trivial merge