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

Change-Id: I876e342195bd2cb4eefb825e0013616d8daa9eb9


Trivial merge