| commit | d48ee36e26a121ba528a56a4a01af22d9ff71679 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Feb 22 21:35:46 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 22 21:35:46 2011 -0800 |
| tree | 65c72a4036595fe03379b499bca2b7307551c5b0 | |
| parent | 247dd6735cd4672ea9aa2a39256913e815835d9b [diff] | |
| parent | 8903c33870f919bbbfdb3131e3d38c1ac97369ca [diff] |
am 8903c338: (-s ours) am 08a65d2c: resolved conflicts for merge of 20c7965d to gingerbread-plus-aosp * commit '8903c33870f919bbbfdb3131e3d38c1ac97369ca': Import revised translations. DO NOT MERGE