Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 27b237e14...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:32:24 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:32:24 +0000 (19:32 +0000)
am: 0f3f2f2fd6

Change-Id: I1bc6ecc505c65934196db14d5492ba4fa35bcdf7


Trivial merge