am 1a429047: am fc6346d4: Merge "Rewriting android.text.format.Time without the native _tz functions"

* commit '1a4290473df0f583dff5cb2b5856465e5e27d1c7':
  Rewriting android.text.format.Time without the native _tz functions