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

Change-Id: Ib8dc9a7e9d830fcee369ae18ca93ef09ba3b1351


Trivial merge