summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-12-10 12:57:50 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-10 12:57:50 -0800
commit7802a1a523647025a6bad5d6b0c8543e1cd102fe (patch)
treedce3549ef213a4ef14cbb99c2975627e4719749e
parent109271b7bcbc5707e3c737ffde737ed64dc34d08 (diff)
parent7d02115db0ac7597ffcd0f016c1a4e973e6fd83e (diff)
downloadTimeZoneData-7802a1a523647025a6bad5d6b0c8543e1cd102fe.tar.gz
[automerger skipped] DO NOT MERGE am: a11e5864bd -s ours am: 1258a5b4be -s ours
am: 7d02115db0 -s ours Change-Id: I5cfe9fc2fe6547c1814b8496660f51ccb24f4f57
0 files changed, 0 insertions, 0 deletions