tree 5f34fa08fac3a48fcde3aeef7dd7f007ac4e4619
parent 1d3afb3492471539e7368802596333bbe077e3dc
parent d53208c8e7ca4b2e2d4070d8e67ec1ee078cee74
author Mathieu Chartier <mathieuc@google.com> 1464122814 +0000
committer android-build-merger <android-build-merger@google.com> 1464122814 +0000

Merge "Increase test timeouts"
am: d53208c8e7

* commit 'd53208c8e7ca4b2e2d4070d8e67ec1ee078cee74':
  Increase test timeouts

Change-Id: Ic1082f39b07b2a093b861d9012fdf542a2f795d0