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

Change-Id: I305ad2898d6d7ae516d04438a351e3a33f5cffd3


Trivial merge