Merge "Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 19:57:00 +0000 (19:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:57:00 +0000 (19:57 +0000)
am: 8e5ee8a4f8

Change-Id: I36f3e382d22854f153a7647fb74240f35038a700


Trivial merge