Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca6...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:49:33 +0000 (18:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:49:33 +0000 (18:49 +0000)
am: b7985f162a

Change-Id: I1912ccb4b215fd4eb85feb05d48847553393b2fb


Trivial merge