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

* commit '2b49b6afa60724c8ad0383e732b116fffa6b1758':
  Rewriting android.text.format.Time without the native _tz functions