tree 5b4c0007196af57ed42327f76d22cec4cd4e64da
parent 3770c47387d3dfc6d2e2d32f4409a82119e726e3
parent 654c376fda3035af5b9090edc2a0a32382baf21c
author Simon Wilson <simonwilson@google.com> 1416615897 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416615897 +0000

am 654c376f: DO NOT MERGE Reduce TIMER_INTERVAL_FOR_WAKELOCK_IN_MS to 100ms

* commit '654c376fda3035af5b9090edc2a0a32382baf21c':
  DO NOT MERGE Reduce TIMER_INTERVAL_FOR_WAKELOCK_IN_MS to 100ms