am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev

* commit '169c11dd39ec44364168785a7a83fb747e893c9a': Add missing DateFormat method.
2015-01-08 01:23:35 +00:00
parent 7e39385365 169c11dd39
commit 33b2de7f34
1 changed files with 5 additions and 0 deletions
--- a/tools/layoutlib/bridge/src/android/text/format/DateFormat_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/text/format/DateFormat_Delegate.java
@@ -34,4 +34,9 @@ public class DateFormat_Delegate {
    /*package*/ static boolean is24HourFormat(Context context) {
        return false;
    }
+
+    @LayoutlibDelegate
+    /*package*/ static boolean is24HourFormat(Context context, int userHandle) {
+        return false;
+    }
 }