resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp

Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
2011-02-25 12:39:59 -08:00
parent 09979bcf73 66edf2bb3f
commit f114809031
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/widget/DatePicker.java
+++ b/core/java/android/widget/DatePicker.java
@@ -711,3 +711,4 @@ public class DatePicker extends FrameLayout {
        };
    }
 }
+