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

Change-Id: I8683b8a1741f927508c56f43e64c3cf6213a74be


Trivial merge