tree aa2186e47d8d1c58464bb7a2aee6a0da5cfd4303
parent f1f4c0cbe1ebef69675b619144bf305cbe0fa9fa
parent 2878c1ec89106b92f9c77f848f7333a45e8adee3
author Andrew Hsieh <andrewhsieh@google.com> 1369786337 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369786337 -0700

am 2878c1ec: am f2d1fca8: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"

* commit '2878c1ec89106b92f9c77f848f7333a45e8adee3':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event