| commit | e8ae9961b47452e7217f131df294a19304f0cb45 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Wed Oct 29 22:53:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 22:53:44 2014 +0000 |
| tree | a1f319ff506a3d52627d2a081f3b4c1bcb00f165 | |
| parent | 2df4ea4601075b3b0ef3e87d67f7107cbaeb5de2 [diff] | |
| parent | 0d1356c4f1a6627e10b2c587a5e3f415e2da1064 [diff] |
am 0d1356c4: (-s ours) am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '0d1356c4f1a6627e10b2c587a5e3f415e2da1064': Import translations. DO NOT MERGE