| commit | c41c31925e30a989f12e2e20bfd6714e9975a0b1 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Jun 12 14:52:38 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 14:52:38 2012 -0700 |
| tree | 245b438eac6135d6334fcc8b1dd5b042112da0c1 | |
| parent | 6c008afd80afe79b5e6024952ee541262ceac9da [diff] | |
| parent | 61bb5caabb5836e4dfff1ef0a66be237d1213b2e [diff] |
am 61bb5caa: (-s ours) am eb2c7c2d: Import translations. DO NOT MERGE * commit '61bb5caabb5836e4dfff1ef0a66be237d1213b2e': Import translations. DO NOT MERGE