tree c2ce3a0c4616b0316e4316f50d2ae7df37cf39af
parent 2c4b0905513b73c9e0435632cbaa00320480a857
parent 64b5f7cc4ca094754d4631ffb801b7bb771081ec
author Andrew Hsieh <andrewhsieh@google.com> 1369786202 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369786202 -0700

am 64b5f7cc: am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"

* commit '64b5f7cc4ca094754d4631ffb801b7bb771081ec':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event