tree 83681ad2aaa3a6e7fc990caba1da562ae2e651e1
parent d14f472dcc6742481f687cb16f5a3115026e1c74
parent f0217cdbde4334bfe2fad7fa484cfa000241ea08
author Andres Morales <anmorales@google.com> 1450472735 +0000
committer android-build-merger <android-build-merger@google.com> 1450472735 +0000

fix error in timeout computation am: 66261db8d2
am: f0217cdbde

* commit 'f0217cdbde4334bfe2fad7fa484cfa000241ea08':
  fix error in timeout computation