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

Change-Id: Iff260b7a0cac1f300e09ae4799c0f0bb37e6fd16


Trivial merge