| commit | 439c551cf3e5b4401d9fa1a7f7196693172cf6a3 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Mar 20 19:36:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 20 19:36:30 2012 -0700 |
| tree | 15191217d69e0b9a51340848cf4f90d57fb6fda6 | |
| parent | 7448daee66a9210a4c768558eb50e425f6d99d29 [diff] | |
| parent | 2c95ab5e48cfa5eeb31a394bd249d4eaf27493ea [diff] |
am 2c95ab5e: (-s ours) am 5665cda1: Import translations. DO NOT MERGE * commit '2c95ab5e48cfa5eeb31a394bd249d4eaf27493ea': Import translations. DO NOT MERGE