Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 18:50:04 +0000 (18:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 18:50:04 +0000 (18:50 +0000)

Trivial merge