tree 96b03f7d96877ed1279c2ad4e291e03dfe024ead
parent b6269d751a9192ca08eda27727e8787e2ad319ff
parent 5eca115b68ed73bb91a3bf2ae694ea7714554cbf
author Ningyuan Wang <nywang@google.com> 1493255632 +0000
committer android-build-merger <android-build-merger@google.com> 1493255632 +0000

Merge changes from topic 'fix_configure_chip' into oc-dev
am: 5eca115b68

Change-Id: Ice788fc3d3c9226fa47df0b598927ea4a349332e