tree e907d583e008817cbea6295d8649108fe40f1009
parent e43619de1834e2d65db30e5e53df94c68999466a
parent 24e03c6303252efb6beda473478397326be70c7a
author Ningyuan Wang <nywang@google.com> 1493256256 +0000
committer android-build-merger <android-build-merger@google.com> 1493256256 +0000

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

Change-Id: Ie888172fe36ca78e218b4fdaaebd6c2ae592eddc