am 2dfca38e: am 8d83d91e: Terminate test process after first OOM in compute_interop...
authorJarkko Pöyry <jpoyry@google.com>
Fri, 30 Jan 2015 21:35:20 +0000 (21:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Jan 2015 21:35:20 +0000 (21:35 +0000)
* commit '2dfca38eceaf93d7b7e48ab00fb15d8e17b5b54a':
  Terminate test process after first OOM in compute_interop tests.


Trivial merge