tree 64b3dfcbf3b8e66aebe9e813ee51dabcdb1a711a
parent 31a5a1c15cc1e177693f84c29fe301c5b0ecbc54
parent 66eab81ef7f2f739b34252d05a0e2e070222f03a
author Selim Cinek <cinek@google.com> 1411761148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411761148 +0000

am edccb1be: am a9827245: Merge "Increased the falsing threshold when woken up by touch" into lmp-dev

* commit 'edccb1be4f9a83c80b3117054c16678762c496c5':
  Increased the falsing threshold when woken up by touch