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

Change-Id: Iedd9d5906f75f67c92a095d67f32ab45534b7f73


Trivial merge