| commit | 78f8e0ad3addf7e7075735f5c8c2c04c750c858c | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Wed Jun 20 22:34:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 20 22:34:25 2012 -0700 |
| tree | 0eb426dea053e7b17c93ca63eb059ce9d6f4eee1 | |
| parent | ff08772a422a8f93792cf49f0f804ee4f42a909f [diff] | |
| parent | 2e67168492d5453876e913937ed1e36111fc2e48 [diff] |
am 2e671684: (-s ours) am 2574da18: Import translations. DO NOT MERGE * commit '2e67168492d5453876e913937ed1e36111fc2e48': Import translations. DO NOT MERGE