Commit b30f6eb0 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev 

* commit '9e6104d5':
  Upgrade pre-jb-mr2 releases to tzdata2013d.
parents b8e1033c 9e6104d5
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