| commit | 8550e1572959552b29cf1bcb1be5cd6b659442d3 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 19:04:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 19:04:29 2014 +0000 |
| tree | 949a3489e6255cd45398e8958ef77a090feeb0a4 | |
| parent | 63b5414d548d5ad3b087afb478f68796dabe44fb [diff] | |
| parent | 3ef140effe597ba38e88fc551f38d8f299cc5a1c [diff] |
am 3ef140ef: (-s ours) am 7171bdb4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '3ef140effe597ba38e88fc551f38d8f299cc5a1c': Import translations. DO NOT MERGE