tree 1bca428638838b19f55f8bd41e9a75710c0b22cc
parent a60f38181465d5f5a37ea8f9ad34326ea2e21ef0
parent 36cb88b70c39e507e9017f0bd7121da57e568744
author Elliott Hughes <enh@google.com> 1363052783 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363052783 -0700

am 36cb88b7: am 53630c0e: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."

* commit '36cb88b70c39e507e9017f0bd7121da57e568744':
  Cache the most-recently used timezone for mktime_tz and localtime_tz.