tree 08a606589fc40b91888ece250e38e0695e40645d
parent 2c72bde78ab61c9bedd5d23717063af4dabba257
parent 59ca78c937d958e5a0426182d0ee4ce6f03f65b5
author Selim Cinek <cinek@google.com> 1411500868 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411500868 +0000

am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev

* commit '69d53b0ee95c7b27223d12a67bbf653b3b8c9004':
  Enforcing falsing-threshold on touch when using AoD