Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:12:41 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:12:41 +0000 (19:12 +0000)
commit910b6e1307f0ec6d40319b4c1be60ea520a4101b
treed45289fd9ce56c6b8363d509c9ff36e528a7f5c5
parent82f012b41b75d2a2690e8551e8571047255a8921
parentdcf24e832610fd8cdc5341984564e5a9dfe9614d
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: e9835d0aa0
am: dcf24e8326

Change-Id: I1b29b5eeca77fff3e8db9059a92bec74edd5060d