| commit | b1c3072ca3cf6835b43d2e7152b284d00bdcdadf | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Oct 22 12:52:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 22 12:52:23 2013 -0700 |
| tree | 0685975eb8506bf06d074eb883070711fecde664 | |
| parent | 501633dd45858159255447f7b4118a80b44bbcae [diff] | |
| parent | d94b7ffc2e621a48bed9f10fa03dcc7508fce8ce [diff] |
am d94b7ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd94b7ffc2e621a48bed9f10fa03dcc7508fce8ce': Import translations. DO NOT MERGE