OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecd5f1c 05e4042)
Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m
authorConley Owens <cco3@android.com>
Sat, 30 Apr 2011 00:35:29 +0000 (17:35 -0700)
committerConley Owens <cco3@android.com>
Sat, 30 Apr 2011 00:35:29 +0000 (17:35 -0700)
Conflicts:
core/java/android/widget/ScrollView.java

Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80


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