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

Change-Id: I6035d3e7d62e1b49556abdcac6563f363f7164c3


Trivial merge