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:30:05 +0000 (04:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 04:30:05 +0000 (04:30 +0000)
commit09be485667fc96df24d2e2ab6ce4fc4f26588739
treea124eed9e4674f044a30735be9d86608483eaf80
parentce12ffb0176f1ed42caf82ad07996c06f556a582
parent69b8174c5e184d0a314821d24893e931946ede83
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e am: 18e7c64ea8 am: 6eac97d4ba
am: 69b8174c5e

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