| commit | a81b1cad2bc3c8eca7ae4046f79058daf02dc82c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Nov 13 20:58:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 20:58:23 2014 +0000 |
| tree | 10daf47dc02069323a02d8408a2357db00198834 | |
| parent | cb906677fc65fd1b43f6dc3b8e029711ec8e86dc [diff] | |
| parent | 4cc7bbc9fd937c6f25962fd6971e77773114aff2 [diff] |
am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '4cc7bbc9fd937c6f25962fd6971e77773114aff2': Import translations. DO NOT MERGE