| commit | 331a7d75547fba280c695b311263fcef9d99bde6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 14 00:32:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 00:32:32 2014 +0000 |
| tree | 37978b6232a6c35dd586d00a6b951f0f4b3555b3 | |
| parent | 551035c03bcaa7e3af2cad2b3b2115bc143e4710 [diff] | |
| parent | 94364694ecfce10954fdb59ec51150456ddfb200 [diff] |
am 4c44a0b7: (-s ours) am ef9d4644: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '4c44a0b7bbad6472a87ad576ac66d67af53be0aa': Import translations. DO NOT MERGE