Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 20:16:53 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:16:53 +0000 (20:16 +0000)
am: 3e8cc8637b

Change-Id: I894f2dd0e8079df9155d412f8b0926dacd683242


Trivial merge