OSDN Git Service

resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp
authorMichael Wright <michaelwr@google.com>
Tue, 30 Apr 2013 05:50:43 +0000 (22:50 -0700)
committerMichael Wright <michaelwr@google.com>
Tue, 30 Apr 2013 05:50:43 +0000 (22:50 -0700)
commit09ab7ef9f76d7e1a614ee8a8be915d06894f8d37
tree2e2aed0fdeda463536d305955d3a9c918b14e0cc
parentfd0b0072db6d89c85a5ea20383a1c3dc289d1d38
parentb3f6687756ffb660f834ef673bed04b2d4a26d21
resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp

Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d
cmds/input/src/com/android/commands/input/Input.java