Merge "Optimize swapchain OOM tests am: 1614827a71 am: c4cd6ba5e7 am: 58dd13c4bd...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 18:49:37 +0000 (18:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 18:49:37 +0000 (18:49 +0000)

Trivial merge