am 176c0ecd: am 23f6a4ab: am 8178edfc: Merge "Fixing android.text.format.Time...
am 176c0ecd: am 23f6a4ab: am 8178edfc: Merge "Fixing android.text.format.Time for non-English locales"
* commit '176c0ecdb15683cdfb39c0fc9944213a65746b91':
Fixing android.text.format.Time for non-English locales