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

Change-Id: I19990dc29eda0b601694d9c78727b5a6d0b8234a


Trivial merge