am 2a8be3cf: am ecdf20d4: Merge "Fix NPE in DateFormat.is24HourFormat."

* commit '2a8be3cf5ebabbbb0c42d946f28cfe33d5653be6':
  Fix NPE in DateFormat.is24HourFormat.