Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:15:10 +0000 (17:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:15:10 +0000 (17:15 +0000)
commit90bef986f4e5df4755e967e97b6944315f23432b
treed4db0f2971d9c79cfb5f54d1698d277fdf934784
parentc1c16ccda16e02131f1d5759d7bf6b122c1fde53
parent72e1df9930eee1239f62af14a0c15b2f76ea64ee
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee
am: 72e1df9930

Change-Id: I5a9374fdb7183b3a0a1f5bc4d880217d27edb3dd