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

Change-Id: I19a797db2d44e9944d8553bc51d52469767bcf83


Trivial merge