| commit | 2d5633924614a918497fdea9b4abb272995fdb4a | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Jun 08 16:55:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 08 16:55:29 2012 -0700 |
| tree | 52354e792d3ea6dc84b62ef1940a62677b195f2d | |
| parent | e7b34b9f867b64eabc3606e5ef21e26eda8de0f6 [diff] | |
| parent | 65128b5a52b22dce04cd0ae9d7a14fe671abd598 [diff] |
am 65128b5a: (-s ours) am 2d5ba8bb: Import translations. DO NOT MERGE * commit '65128b5a52b22dce04cd0ae9d7a14fe671abd598': Import translations. DO NOT MERGE