commit 474ee4520351a1e68b887e84defd57588fca9c25
author Justin Koh <justinkoh@google.com> Wed Dec 10 00:24:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 10 00:24:28 2014 +0000
tree e8ee4963dae4be4ce18567fd4574e08353dc8fcf
parent 52f42a387e781c7da55043251fcd1cd5e8296dfa
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