| commit | d2387299fa70930573c0a7703da9151013e99dd3 | [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 | cba6885730afd9b20073ad40b49be2cfd8dccb12 | |
| parent | 3b7e14ad05557e97578a6776ad4190b7697fd4c3 [diff] | |
| parent | 5d98dcace09aca14e47dfaebe29213991f6ffa45 [diff] |
am 2e671684: (-s ours) am 2574da18: Import translations. DO NOT MERGE * commit '2e67168492d5453876e913937ed1e36111fc2e48': Import translations. DO NOT MERGE