Merge "Optimize swapchain OOM tests" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:27:50 +0000 (18:27 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 20 Jan 2017 18:27:50 +0000 (18:27 +0000)

Trivial merge