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

* commit '032d8e3890335e96b16bfa3fbd7706fbb0f2d2c0':
  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