tree 5bcf51f3db539f1d10e19e903a1a33b3451d252d
parent 529998beb2695a1b88fb36c45674a13069543d00
parent 36321bc72749e4e6991c79618f4930fc46f2c50e
author Jungshik Shin <nobody@android.com> 1241136591 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241136591 -0700

am 36321bc: AI 148032: Taipei timezone name fix.

Merge commit '36321bc72749e4e6991c79618f4930fc46f2c50e' into donut

* commit '36321bc72749e4e6991c79618f4930fc46f2c50e':
  AI 148032: Taipei timezone name fix.