OSDN Git Service

Merge "Make run-test give extra time when doing gc-stress runs." am: 1160f2e
authorAlex Light <allight@google.com>
Thu, 17 Mar 2016 18:50:59 +0000 (18:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Mar 2016 18:50:59 +0000 (18:50 +0000)
commitcaa731d6389eaeb2d5b0e7b14a3c18ceb90a67ba
tree7dda200bde3ac7637b2df33ce389dd568cb1c5c0
parent34244e65d193ac50f7c77d0836a8de69de53d53a
parent1a33d898a40b7a5a943294812a4f5f3af382c7e6
Merge "Make run-test give extra time when doing gc-stress runs." am: 1160f2e
am: 1a33d89

* commit '1a33d898a40b7a5a943294812a4f5f3af382c7e6':
  Make run-test give extra time when doing gc-stress runs.