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

Change-Id: I06e852cc34ee156dbd66ac36fbb052a2db8ec36f


Trivial merge