OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9830f11 9ec9787)
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 02:02:42 +0000 (02:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 02:02:42 +0000 (02:02 +0000)
am: 9ec978732f

* commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
  DO NOT MERGE: fix build breakage

1  2 
include/input/Input.h patch | diff1 | diff2 | blob | history

diff --cc include/input/Input.h
Simple merge
frameworks/native
About OSDN
Find Software
Develop Software
Help