tree 1004b47ade2a7906afd79741f476e17606e69333
parent 3f74f6386a15d09f27dbc81edd8dd2c13e298d73
parent 1e53b98c38b6606859f4b33a98d776cbb65f1a42
author Bryce Lee <brycelee@google.com> 1425915305 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425915305 +0000

am 1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev

* commit '1e53b98c38b6606859f4b33a98d776cbb65f1a42':
  Allow press and hold from non-interactive.