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

Change-Id: I0860b4a288e7f56d462411892eae21e19d1a462b


Trivial merge