tree e0f84518cce461f151b2b1c1269fcf0ba53ff0be
parent 322fe808e375fa8f0c51a57a5bf6904c8e633e68
parent 21b0c88b3c290141f9a7593bb249ab117af48b91
author Raph Levien <raph@google.com> 1379533773 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379533773 -0700

am 21b0c88b: am c540f8e9: Merge "Revert "Take the input device into account for meta state"" into klp-dev

* commit '21b0c88b3c290141f9a7593bb249ab117af48b91':
  Revert "Take the input device into account for meta state"