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

Change-Id: I3edc76c6a0c96a57220a49c909c35fe57f3b3e7b


Trivial merge