am 8178edfc: Merge "Fixing android.text.format.Time for non-English locales"
am 8178edfc: Merge "Fixing android.text.format.Time for non-English locales"

* commit '8178edfc096e797917257c8cbc715f0a31fe551a':
  Fixing android.text.format.Time for non-English locales

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base