| commit | ca96a793f33df2224ad9d5bfbd9f8b8c82259822 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 22 14:47:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 22 14:47:12 2012 -0700 |
| tree | b369006ddff15b2d03da7ea0a83a487043c55003 | |
| parent | 663005248dd5d62198feb2188bc9e841739b673e [diff] | |
| parent | 066d3f9b3bd77df71542b132adda8eb25bc013c0 [diff] |
am 066d3f9b: resolved conflicts for merge of 3e5e9e9e to jb-mr1-dev-plus-aosp * commit '066d3f9b3bd77df71542b132adda8eb25bc013c0': Add a directory for tzdata updates.