| commit | bc2d5e414635d3c3460d89e251104c9b981a45d8 | [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 | 89893129a55cf79038adfe36925ed61c6a36a08b | |
| parent | ecd5f1cc409489273d386f04fc32038d3b389d75 [diff] | |
| parent | 05e4042a1e89b5facc2329da98ff844b658c94a3 [diff] |
Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m Conflicts: core/java/android/widget/ScrollView.java Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80