| commit | bb5fcdb8fb493017004cfc542dfd16c9d7a96760 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 21:00:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 21:00:41 2014 +0000 |
| tree | 2315f5c39925ed8cc7c5dc072671fa062981055c | |
| parent | ca9f051731390ee7f0599af099989084410fbe50 [diff] | |
| parent | 2e9a8304302ef84191d29fa62e7f3ef00c636043 [diff] |
am 2e9a8304: (-s ours) am c7e670e2: (-s ours) am de4817e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit '2e9a8304302ef84191d29fa62e7f3ef00c636043': Import translations. DO NOT MERGE