tree 555be2ba96c58e6d11c2dbdb5ed1376a4a41b1aa
parent 4177bd8d16e0dc2d0d541fc54f81518c57651e55
author Christopher Ferris <cferris@google.com> 1424308307 -0800
committer Christopher Ferris <cferris@google.com> 1424310350 -0800

Modify test to avoid race condition.

There is a possible race if a timer is set to trigger at nearly the same
time as it is set. Since nobody uses the timers like this, modify the test
so this doesn't happen. The race that this can provoke has been fixed in
aosp.

Bug: 19423618
Change-Id: I21084c99da5ae46f404936d673dae6bad7c82caa