Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:19:33 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:19:33 +0000 (18:19 +0000)
commit5308189b3f51bff2237b4ab5dbb0b2c4e255b513
treeb3b5b918ef6d9a2a34665ce3b464fff6bc3d9ac8
parentf2ebab30132e73562350af6f3efe12748c23b065
parent55caa1ac8c4ad165a60dca453b9e8ad8ad618830
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: 72e1df9930 am: f750d4ffc3 am: de7e3e2be7 am: 5b059bb044
am: 55caa1ac8c

Change-Id: Iab524605cba2e0af1fb34f3b304e4924012910f0