| commit | 129d0ae7aba20fe4df2eb57c0c380e31fb68e574 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 15 16:11:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 16:11:54 2014 +0000 |
| tree | ad720588ce1daa6cfaf90d459cd42325e16f4b66 | |
| parent | c6f24de74ec84cfac07a95dd6d8cd735bc8418b7 [diff] | |
| parent | f02a9d7c3f51e7286f984456a870801bb9bf94ef [diff] |
am f02a9d7c: (-s ours) am cdf02ddd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f02a9d7c3f51e7286f984456a870801bb9bf94ef': Import translations. DO NOT MERGE