| commit | 85f079ee58432ca20a55d8323724d0416cd2a594 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 17:08:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 17:08:30 2014 +0000 |
| tree | 3f849c6e853990a29585410d0ddacfab6f05acb7 | |
| parent | d186d919d6bf0ee5ac02856db90e6d755ca625dd [diff] | |
| parent | 2f831575253e4f5a9e329e857aad2cd816f47524 [diff] |
am 2f831575: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '2f831575253e4f5a9e329e857aad2cd816f47524': Import translations. DO NOT MERGE