| commit | 22af14587e228d737890888952808880f8b51f05 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 17:37:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 17:37:49 2014 +0000 |
| tree | 90c31bcc3ed9e02937f5e0c9f9576d4c9a45af6a | |
| parent | f0de3a5ca35df8f94c1546bde60b6d89f2741b13 [diff] | |
| parent | 5d50bf02a6f34afd493e4d38f784790e08f6bd7e [diff] |
am 5d50bf02: (-s ours) am 44b769d0: (-s ours) am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '5d50bf02a6f34afd493e4d38f784790e08f6bd7e': Import translations. DO NOT MERGE