| commit | 7448daee66a9210a4c768558eb50e425f6d99d29 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Mar 20 19:36:03 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 20 19:36:03 2012 -0700 |
| tree | 15191217d69e0b9a51340848cf4f90d57fb6fda6 | |
| parent | 2b5a7184a27a224ba2f2e30e1cce4c64d86de943 [diff] | |
| parent | b22dff48f88068bb5ea1d4142267a029f34d5268 [diff] |
am b22dff48: (-s ours) am 63cad3dd: Import translations. DO NOT MERGE * commit 'b22dff48f88068bb5ea1d4142267a029f34d5268': Import translations. DO NOT MERGE