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

am 2ec847de: am d7e7b626: am 804cc979: am 89ebe31d: Merge "Fixes associated... 

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

* commit '2ec847de':
  Fixes associated with the tzdata 2015a update
parents 93bd0b50 2ec847de
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