| commit | 297013dd4cee3f27f1df73bde642d8636492954b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 19:57:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 19:57:33 2014 +0000 |
| tree | 691ce7c81ae073c0483174ea0af64cfc528d0203 | |
| parent | 4ceb3c0412985dfa8f517bee024fd7e978156394 [diff] | |
| parent | 7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7 [diff] |
am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7': Import translations. DO NOT MERGE