summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2017-11-06 15:32:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-06 15:32:42 +0000
commit111841398e5daaf25d87a971f4a03d6b7dea2fce (patch)
treeb937e3a4d97bbd95aacaddaa5b2fbeddad5ef642
parent73e6f511cce54c1a776d1716a803c50920edec37 (diff)
parentc4357ca99f64aec4e4200f44d47a41e130b012e9 (diff)
downloadTimeZoneData-111841398e5daaf25d87a971f4a03d6b7dea2fce.tar.gz
Merge commit '587cdcfbad39f38bdd25c267eeae01202a52f29d' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master am: 3c11dd99cf
am: c4357ca99f Change-Id: Id9044920fc3ccbf5a0a0e2d8072ca1ba285fbc35
0 files changed, 0 insertions, 0 deletions