am 82461951: Merge "DateUtils should use the user\'s 12/24-hour preference, not the locale\'s."
am 82461951: Merge "DateUtils should use the user\'s 12/24-hour preference, not the locale\'s."

* commit '82461951c3bddd5e6873dbb66703b838cbb66b2c':
  DateUtils should use the user's 12/24-hour preference, not the locale's.

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