| commit | 08d339fc20711ad1105c6f9b87b0bcb276ee7db1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 06:49:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 06:49:43 2014 +0000 |
| tree | 5e2fbe5f2a26b4d7837676c40ca8a58a58d167ad | |
| parent | 45e0baf333c7015456f610631e4fa11d54345aa4 [diff] | |
| parent | 7ef557764c27efc5766c849b4982c70d05864dfe [diff] |
am 7ef55776: (-s ours) am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7ef557764c27efc5766c849b4982c70d05864dfe': Import translations. DO NOT MERGE