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

automerge: 33b2de7

* commit '33b2de7f34180983fe596ff9faa6955b032fa157':
  Add missing DateFormat method.

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;
+    }
 }