Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:04:36 +0000 (17:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:04:36 +0000 (17:04 +0000)
am: 72e1df9930

Change-Id: I7f6e01adc8d3e534811104cd7ac8b2bc98d74a93


Trivial merge