Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:11:43 +0000 (18:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:11:43 +0000 (18:11 +0000)
commit3e8a4378edaa1c0fe47c391c1cbe6b971b83f4b0
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parentb668470269859aea973ddc63b36ef934a2e3b45b
parent4fbd59a8c5e5aed0c87b24843f7c7cd9dea6efee
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: 72e1df9930 am: 90bef986f4 am: 56270fdfb8
am: 4fbd59a8c5

Change-Id: Id2a462100d3253128d0a9d22786a6dbfffaec717