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

Change-Id: Iae6aea1f732a6d2e78681cd27f5a695233fb7448


Trivial merge