Merge "Optimize swapchain OOM tests am: 1614827a71 am: c4cd6ba5e7 am: 58dd13c4bd...
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 18:58:05 +0000 (18:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:58:05 +0000 (18:58 +0000)
am: 52dd024c04

Change-Id: I7d36cc6775181b9d7435e38f2eb8ddfed5657fb6


Trivial merge