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

Change-Id: Ibf7780711e82ebdea81d88b9712cb6c3216928b6


Trivial merge