| commit | cecea547e0bcb0ae9332d930a0859e31faed9418 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Jun 05 09:21:09 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 05 09:21:09 2012 -0700 |
| tree | 5977b58d0803a9c2c19b805367920cba5e05c91d | |
| parent | 9b60b24cb4c8fdcb53311af1f743d3a85173da3d [diff] | |
| parent | ace41309bafb9fff9b8db1d51c5f9a1fa1fca06d [diff] |
am ace41309: (-s ours) am f6b1eb79: Import translations. DO NOT MERGE * commit 'ace41309bafb9fff9b8db1d51c5f9a1fa1fca06d': Import translations. DO NOT MERGE