summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-25 08:17:47 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-25 08:17:47 -0800
commit8e88cf9aba8d4158bb0309ff524e74ee97de11be (patch)
tree94484d2af6ecd3ad3afcfc262e2b61af0262f05f
parenteb86c6912d0b62cba640f0dd16b0a77810dc0463 (diff)
parentcd18025fdd90188edbe168b68b642f9852a1dc1e (diff)
downloadTimeZoneData-8e88cf9aba8d4158bb0309ff524e74ee97de11be.tar.gz
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 25dc069c8a -s ours
am: cd18025fdd -s ours am skip reason: subject contains skip directive Change-Id: I7fe062276f27f44b1726ed18bc72025c452a4796
0 files changed, 0 insertions, 0 deletions