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

Change-Id: Ibef92f208dbe3494855c4a99df9231f773db3615


Trivial merge