| commit | 6a6369b61a51ebf415a37d19e5b2aba789bc9ce7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 23:52:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 23:52:31 2014 +0000 |
| tree | 50592195d6ea25a90bc7984eec248ccb0d5aa7a4 | |
| parent | f35c305f45db60394c3c7fec2e41b38963da70ca [diff] | |
| parent | fc8d65197a6404a93f1230ac5ebc635438a5c094 [diff] |
am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'fc8d65197a6404a93f1230ac5ebc635438a5c094': Import translations. DO NOT MERGE