| commit | 85e5c1968bf05c19307e5663c5b5afd062ca8753 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Nov 13 21:05:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 21:05:48 2014 +0000 |
| tree | b3bbcad6b8899af29cf173562696cd3404d64027 | |
| parent | c69191c195819bdbefef151fd13bdbef03aab741 [diff] | |
| parent | a81b1cad2bc3c8eca7ae4046f79058daf02dc82c [diff] |
am a81b1cad: (-s ours) am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'a81b1cad2bc3c8eca7ae4046f79058daf02dc82c': Import translations. DO NOT MERGE