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

Change-Id: Id9d29d51ace7767e0b2a57a32d3f38379ed32900


Trivial merge