OSDN Git Service

resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6a...
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 04:15:24 +0000 (04:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 04:15:24 +0000 (04:15 +0000)
commit0370a03b6e74e40d5110b83fed2243bf072aee73
tree6a0178fff3a8aff0986c89cc2ab9a13de732cfb0
parenta82ace99f76ed815e16ab64eae2e9e55871a8b8f
parent1b28b05d2edf11f49717b53cd49a9161892f0388
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f
am: 1b28b05d2e

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