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

Change-Id: Ifa8e06e5d64204fefbbf616a69e43d2a8f3d3d0c


Trivial merge