| commit | 8903c33870f919bbbfdb3131e3d38c1ac97369ca | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Feb 22 14:49:15 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 22 14:49:15 2011 -0800 |
| tree | 36b00db7ef13bf62e7d76b0186abe8d61c856bbe | |
| parent | 247dd6735cd4672ea9aa2a39256913e815835d9b [diff] | |
| parent | 08a65d2c5b75ac57428d7da718f3e2569f321d4c [diff] |
am 08a65d2c: resolved conflicts for merge of 20c7965d to gingerbread-plus-aosp * commit '08a65d2c5b75ac57428d7da718f3e2569f321d4c': Import revised translations. DO NOT MERGE