| commit | 56326d14b579b2db23f0479d3613071a53f129b5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 13 17:13:46 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 13 17:13:46 2013 -0700 |
| tree | b10b733f360f90a1e04c9bc79f7607f7211989fb | |
| parent | 4105fcdb3cbc820ec560740f02f3061d30e42419 [diff] | |
| parent | e0d1d4cf497bddd8f24b6d22feec33d655cae0dd [diff] |
am e0d1d4cf: am 6ebc24fc: am d3f9e815: resolved conflicts for merge of 5d0ad38c to jb-mr2-dev * commit 'e0d1d4cf497bddd8f24b6d22feec33d655cae0dd': Upgrade pre-jb-mr2 releases to tzdata2013d.