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

Change-Id: I34a8d98620e522244bcc6e60da9173c5b7b00db1