commit | 3647aba82d30143e301d4bb251085f79308d872a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:17:04 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:17:04 2014 +0000 |
tree | ca4eb0d883c823165ef9e7b4435dbc2ca7e9f83b | |
parent | 81b96aadbdc3726186c91b51465fb21ead56888a [diff] | |
parent | ec763118370e1fa79acb96b82a7ad37b6f2cc02e [diff] |
am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'ec763118370e1fa79acb96b82a7ad37b6f2cc02e': Import translations. DO NOT MERGE