Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:08:39 +0000 (18:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:08:39 +0000 (18:08 +0000)
commit4fbd59a8c5e5aed0c87b24843f7c7cd9dea6efee
treeb3b5b918ef6d9a2a34665ce3b464fff6bc3d9ac8
parent3d26b784dddad1b4cb165a8d87af54cea57d23b1
parent56270fdfb89a58f7f229c154fa012024bffc8cd0
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: 72e1df9930 am: 90bef986f4
am: 56270fdfb8

Change-Id: I13d70e83345a99fbc451721f00928b523634f7bf