Merge "Split WSI OOM tests over multiple iterations." into nyc-dev am: 991f09ba41
authorMika Isojarvi <misojarvi@google.com>
Tue, 3 May 2016 18:01:29 +0000 (18:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 18:01:29 +0000 (18:01 +0000)
am: 643dc2cdad

* commit '643dc2cdad5cf60d0500e5ebf064d28b03005f71':
  Split WSI OOM tests over multiple iterations.

Change-Id: I85c4608a95d3f38f10d72959b82a323b14c23b20


Trivial merge