summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-11 11:12:47 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-11 11:12:47 -0700
commit19056ab3b21c78c1cc5fbc8ff8e55a454c821559 (patch)
treedb22aa44e192ae2ba85ba897457a0a751d718f19
parent4b56bad53e083040f4ee1769372d0915bc568ee4 (diff)
parent5a487bbc3ff350d5b1fa1b77daca0f3b16f402dd (diff)
downloadTimeZoneData-19056ab3b21c78c1cc5fbc8ff8e55a454c821559.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 8d1c1e6b93 -s ours am: 20d7b4e675 -s ours
am: 5a487bbc3f -s ours am skip reason: change_id Id15a0e7908a1feee86bab8cedd06024518107dd5 with SHA1 889541b8d9 is in history Change-Id: If7fc22d216e8be78dda08554d6ba6535f2ecfb46
0 files changed, 0 insertions, 0 deletions