tree cc49bbb8abf379490d8a487b9e8b36e43e5ecb3b
parent 65a38b6af4672999950c11a1f0e64174704e8ed0
parent 45ae0d79ad95530f9be184c1e105c7f4661fc51b
author Shimeng (Simon) Wang <swang@google.com> 1306180537 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306180537 -0700

am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.

* commit 'de60ce66c117ebd224b9d3181e2184ec5cfe87f9':
  Simplify browser pause/resume logic to avoid stuck timer.