OSDN Git Service

resolve merge conflicts of 834ac204ce to klp-modular-dev.
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 00:26:19 +0000 (17:26 -0700)
committerNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 00:26:28 +0000 (17:26 -0700)
commit7f1ea80d65996ab687ff56a884da915535cdc176
treece671481724fcc1cff2d15e047d23d7d742987fb
parent72c8ca4a0191827fd3265c0820b685a6cf420be1
parent834ac204ce52d874cdd7ae921e5a4d85c5e42c52
resolve merge conflicts of 834ac204ce to klp-modular-dev.

Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
include/input/Input.h