am a8938aa0: am e678391e: Merge "Rewriting android.text.format.Time without the native _tz functions" into lmp-dev

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