OSDN Git Service

resolve merge conflicts of 834ac204ce to klp-modular-dev.
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 01:44:26 +0000 (01:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 01:44:26 +0000 (01:44 +0000)
commitfa632f6ad7be6b1f488dd3d1b825a82456db5097
tree287cc26a71f2a901393076ff1928104cb313af9b
parent9964d83869565cf4dda432129cfe50f6ede19338
parent7f1ea80d65996ab687ff56a884da915535cdc176
resolve merge conflicts of 834ac204ce to klp-modular-dev.
am: 7f1ea80d65

* commit '7f1ea80d65996ab687ff56a884da915535cdc176':
  DO NOT MERGE: fix build breakage
include/input/Input.h