tree 7c1c26496e324a27addd94a7814ffd86bfc3caf7
parent 15db88e6429dc16806c1ddcda21b486b9fe3be5f
parent 7ee4ba68c2e512989ad18bb52b1df2f9f85e6958
author Elliott Hughes <enh@google.com> 1363372088 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363372088 -0700

am 7ee4ba68: Merge "Return Olson ids from TimeZoneNames.forLocale in zone.tab order."

* commit '7ee4ba68c2e512989ad18bb52b1df2f9f85e6958':
  Return Olson ids from TimeZoneNames.forLocale in zone.tab order.