OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9964d83 7f1ea80)
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)
am: 7f1ea80d65

* commit '7f1ea80d65996ab687ff56a884da915535cdc176':
  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