| commit | b82939b0c2b77d0d3ed1edd429c4f497184d17b9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Dec 05 21:20:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 05 21:20:33 2014 +0000 |
| tree | 1cf89bf450c2fc335a41a6866c90b7cc57b1c87e | |
| parent | bcb71a9842b3673cc8507fae3e71509bcd656758 [diff] | |
| parent | cf6821a94227d665ba8dfd62ee7caad5bd07beaa [diff] |
am cf6821a9: (-s ours) am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'cf6821a94227d665ba8dfd62ee7caad5bd07beaa': Import translations. DO NOT MERGE