Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 27b237e14...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:49:40 +0000 (18:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:49:40 +0000 (18:49 +0000)
am: 36b1aa5745

Change-Id: I662ff45d05608b3c2a551f23fe5969fe5e6ec62e


Trivial merge