OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ec0f48 c2fa26c)
am c2fa26c0: (-s ours) am bc16fb98: am cff01363: Merge commit \'8a196b5630a93a3eb6df4...
authorMichael Wright <michaelwr@google.com>
Wed, 23 Sep 2015 19:50:30 +0000 (19:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Sep 2015 19:50:30 +0000 (19:50 +0000)
* commit 'c2fa26c0f5e6690efb9e99c88ffbb5064b816132':
  DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help