am ae451252: am 8d48c3d2: Merge "Enable AUTO_TIME_ZONE settings." into honeycomb

* commit 'ae451252f425525efd4ade9adbd023a00a89c3e7':
  Enable AUTO_TIME_ZONE settings.