Merge "Merge "CP: Require 'master' config to be supported in Android CTS" into nougat...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:15:49 +0000 (18:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:15:49 +0000 (18:15 +0000)
am: 3f6493985f

Change-Id: I25852ad9f2be17c3cd1a625d1ab2269f6ee9aed2


Trivial merge