Merge changes I85492417,I93389a2c into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 16:42:54 +0000 (16:42 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 13 Sep 2016 16:42:54 +0000 (16:42 +0000)
commit37eaa88ac2447c6bb1a143bf4f61d223edce2005
tree326c60d60cf31a9f1a176e213f6fc16c03b0bed3
parent9ebe97f0a60c56eb5d78dd78c1140836e92a6d9a
parent1735b7bcaa04706338fb8228e92e81cf7a657538
Merge changes I85492417,I93389a2c into nougat-cts-dev

* changes:
  CP: Limit VkInstance count in object_management.multithreaded*
  CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests