| commit | 8d893a3404cdc19417c3dc0f751662c28dcec2f8 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Wed Jun 06 11:06:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 06 11:06:17 2012 -0700 |
| tree | 063776de2f32cba7fda1209ad558fd5ba3f0a5df | |
| parent | fc4be14ac63504c660607389de469ab3b9cbd496 [diff] | |
| parent | 498601a89635d24286a1a112062c05d9bbd9e2de [diff] |
am 498601a8: (-s ours) am b21b749b: Import translations. DO NOT MERGE * commit '498601a89635d24286a1a112062c05d9bbd9e2de': Import translations. DO NOT MERGE