Merge "Optimize swapchain OOM tests am: 1614827a71 am: c4cd6ba5e7 am: 58dd13c4bd...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 19:29:56 +0000 (19:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:29:56 +0000 (19:29 +0000)
am: d98a48ab51

Change-Id: Ic6de8d0bb62bde55221e474c7928d87dd4def20a


Trivial merge