| commit | dddaa56f793ad9ecb4e20df746f562ac7f24d158 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Fri Apr 29 17:35:29 2011 -0700 |
| committer | Conley Owens <cco3@android.com> | Fri Apr 29 17:35:29 2011 -0700 |
| tree | 9928f59f2979598ace84cf1b250b447d45c58c9d | |
| parent | f395e3042accd7f3f5df466dbb532befcd1db5d4 [diff] | |
| parent | b737647db80dad073408064710d61b28890c6e98 [diff] |
Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m Conflicts: core/java/android/widget/ScrollView.java Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80