| commit | de5f6550a2c0262eab1a210165fcfcfef86d7878 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 02 09:34:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 02 09:34:25 2013 -0700 |
| tree | 8cbd143522ec6a34d5f9f792c0f213d258c7c545 | |
| parent | 606926eddf94745fcf147c1d5643dc2f2071a3ca [diff] | |
| parent | 1d63d580f95469fb3a2cd7d92cc69fbf1432d478 [diff] |
am 1d63d580: (-s ours) am 71dfe63f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1d63d580f95469fb3a2cd7d92cc69fbf1432d478': Import translations. DO NOT MERGE