Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 20:16:53 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:16:53 +0000 (20:16 +0000)
commit4bb2e99278cccedc544d6f5b54b9a7bb814a6c42
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parent46e3804f979424a7b29fe46758c06e5c630647fb
parent3e8cc8637b2ad28d7ebc40b64ed159b89ed0d718
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: e9835d0aa0 am: dcf24e8326 am: 910b6e1307
am: 3e8cc8637b

Change-Id: I894f2dd0e8079df9155d412f8b0926dacd683242