| commit | fe734c49df96bd392be9e081aa7f969eaa878087 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Jun 05 15:02:27 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 05 15:02:27 2012 -0700 |
| tree | 5575a8c1c814d7132e326264f5e03a445a12275b | |
| parent | 01f15e45b64bf87edc3383ef0bd318f87f611e94 [diff] | |
| parent | 79a979266d4b64213705a90583bff8847b6ebe64 [diff] |
am 79a97926: (-s ours) am 2493778f: Import translations. DO NOT MERGE * commit '79a979266d4b64213705a90583bff8847b6ebe64': Import translations. DO NOT MERGE