| commit | 0b7b5f4e261d69cf7be304d9ab8bbb7e218ff5ef | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 21:22:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 21:22:41 2014 +0000 |
| tree | 09a01eb95dce4ed464c99cc3b04cc96bde3a9c83 | |
| parent | 8ed1682f20aecc09c13eb1a7d47b3339f6cb0eda [diff] | |
| parent | 8550e1572959552b29cf1bcb1be5cd6b659442d3 [diff] |
am 8550e157: (-s ours) am 3ef140ef: (-s ours) am 7171bdb4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '8550e1572959552b29cf1bcb1be5cd6b659442d3': Import translations. DO NOT MERGE