Merge "Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23...
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 20:52:36 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:52:36 +0000 (20:52 +0000)
am: 1fbdd02485

Change-Id: I623e62c54185b1d5a7e303db3e1034e6c32604c1


Trivial merge