tree 410ec4bcd58ae6c08a743b249350eade49a12002
parent 1224400c882c10e90d6e74cb2ceef33fee50a1e2
parent f4fd4755bfd1a38db1a8a8d87c995ac61d165571
author Justin Koh <justinkoh@google.com> 1418169092 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418169093 +0000

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