| commit | a912698a5c1c2b897307d28f69ce3ebcb545f0df | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:42:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:42:36 2014 +0000 |
| tree | 47dc6fe505fb857e363d2d4190d9f10c8bfcd256 | |
| parent | 642c5c4f9537d55afb88fbc131e6f0522f4ac6cc [diff] | |
| parent | e6897552c2f7e79660cffce68912b046aaad40bc [diff] |
am e6897552: (-s ours) am 7f436dee: (-s ours) am ab9a0774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'e6897552c2f7e79660cffce68912b046aaad40bc': Import translations. DO NOT MERGE