am 0bb497b8: Merge "Use the newer ZoneInfoDB API."
am 0bb497b8: Merge "Use the newer ZoneInfoDB API."

* commit '0bb497b8d1bac2206df89a878ecb7e356d21fe99':
  Use the newer ZoneInfoDB API.

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