summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2014-03-20 10:54:38 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-20 10:54:38 -0700
commitb17cf207372268d91177de7efa692b2483785991 (patch)
tree32c0badcffed9d6fc0f8934ad2c6817a847c76d2 /libs/input/PointerController.cpp
parent6b96ecca90555e04da8a4477d6dc6de83e7b9ee1 (diff)
parent9ee72b65436242ab4f8f4ceb904ea5078779416c (diff)
am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '9ee72b65436242ab4f8f4ceb904ea5078779416c': Verify certificates
Diffstat (limited to 'libs/input/PointerController.cpp')
0 files changed, 0 insertions, 0 deletions