Merge "Merge "CP: Require 'master' config to be supported in Android CTS" into nougat...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:19:35 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:19:35 +0000 (18:19 +0000)
commit3f6493985f13d98b3f68ef207a02765b8862f30a
treeb3b5b918ef6d9a2a34665ce3b464fff6bc3d9ac8
parent5308189b3f51bff2237b4ab5dbb0b2c4e255b513
parent338173432476bdb4c355d76e3a6f4bd626df7661
Merge "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" into nyc-mr1-dev-plus-aosp
am: 3381734324

Change-Id: I63ca6c744d27f88a933a0ce890e9a9fc7c799eb5