commit 247f4b70db14b9c96f562c033107b3e42917ab12
author Justin Koh <justinkoh@google.com> Thu Sep 03 22:05:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 22:05:42 2015 +0000
tree 51bc4fa38b9bf3bdac5faf969e44fc8a9d2bdaa5
parent 6b7609a1fc7d850af4a18d8d18e67d61fb53c2fa
parent 3d6de0212fb5e0b3400c918a07760a163cb409d0

am 3d6de021: Merge "Increased a CTS test timeout from 5 sec to 30 sec. This test was already flaky on L phones and tablets, but it almost never passed on Clockwork Coral (L) devices. Now it passes. Bug: 18040863 Bug: 18533405" into lmp-sprout-dev

* commit '3d6de0212fb5e0b3400c918a07760a163cb409d0':
  Increased a CTS test timeout from 5 sec to 30 sec. This test was already flaky on L phones and tablets, but it almost never passed on Clockwork Coral (L) devices. Now it passes. Bug: 18040863 Bug: 18533405