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)
commitf750d4ffc3b2ddf2771c586035fe7c78c9bf0295
tree5316d6ead7261de48ff2a071956b8e85e3e774a5
parenta2d72443d6b22e0340bbcfef504f50f65e8cee0a
parent72e1df9930eee1239f62af14a0c15b2f76ea64ee
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee
am: 72e1df9930

Change-Id: I7f6e01adc8d3e534811104cd7ac8b2bc98d74a93