am d3f9e815: resolved conflicts for merge of 5d0ad38c to jb-mr2-dev

Browse Source

* commit 'd3f9e8155bfc17b2d67d2ffe5bc1d3a5e2656cd4':
  Upgrade pre-jb-mr2 releases to tzdata2013d.

...

This commit is contained in:

Elliott Hughes 2013-09-13 11:46:09 -07:00 committed by Android Git Automerger

parent 86125acacd d3f9e8155b

commit 6ebc24fcc3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available