Commit 804cc979 authored by Daniel Xie's avatar Daniel Xie Committed by Android Git Automerger
Browse files

am 89ebe31d: Merge "Fixes associated with the tzdata 2015a update" into... 

am 89ebe31d: Merge "Fixes associated with the tzdata 2015a update" into lollipop-cts-dev automerge: 23fe202d  -s ours

* commit '89ebe31d':
  Fixes associated with the tzdata 2015a update
parents 4366a97c 89ebe31d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment