| commit | 396b6c1f1d81164d282544ba2287f94f6c5bb1eb | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 24 18:02:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 24 18:02:12 2014 +0000 |
| tree | 5f309f5385b52a0331569a3542d6c6b022a3aab7 | |
| parent | 236fdae9bc1ebb98162a5e5e5b4ac98edb99520b [diff] | |
| parent | 2d3978f6ff5df038a4ef9deac7779ff4c413daf1 [diff] |
am 2d3978f6: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-chips-cranbrook * commit '2d3978f6ff5df038a4ef9deac7779ff4c413daf1': Import translations. DO NOT MERGE