Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:32:52 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:32:52 +0000 (19:32 +0000)
am: ea8fc92adb

Change-Id: Ie0021d02d98d9afd482c3947c7c2a85b011b5636


Trivial merge