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

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