| commit | daea0c4cbbf75b11a9c93ac1c3b05530a5932f79 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 14 17:49:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:49:49 2014 +0000 |
| tree | 8ce2cf26bc6fdf5e57e5972e38e456414f5a63c2 | |
| parent | 035fd520736196f05ae9dc249e43973a0b159640 [diff] | |
| parent | 331a7d75547fba280c695b311263fcef9d99bde6 [diff] |
am b70944c5: (-s ours) am 4c44a0b7: (-s ours) am ef9d4644: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'b70944c5956d16e96c2c27adc2e7fef755252769': Import translations. DO NOT MERGE