diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-02-25 12:45:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-25 12:45:53 -0800 |
| commit | bc006dc0aa1c149508a3196a40bac62cf1b33b84 (patch) | |
| tree | 57d52b5cb26e9e178138d12af152c6a11ec89847 /core/java/android/widget/DatePicker.java | |
| parent | 097d3a4729583276df166a1f8c0336d8ebafc566 (diff) | |
| parent | dc365a36dac50bccc1411c37839513daec56d335 (diff) | |
am dc365a36: Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit 'dc365a36dac50bccc1411c37839513daec56d335':
Use different version of CLDR data in DatePicker
Diffstat (limited to 'core/java/android/widget/DatePicker.java')
| -rw-r--r-- | core/java/android/widget/DatePicker.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java index df32c51e30e7..1d442dbbdc82 100644 --- a/core/java/android/widget/DatePicker.java +++ b/core/java/android/widget/DatePicker.java @@ -720,3 +720,4 @@ public class DatePicker extends FrameLayout { }; } } + |