| commit | ab4068c387d9219f1b5f0b596028ccac6cfd2788 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 28 15:47:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 15:47:45 2015 +0000 |
| tree | 63ae8f80f0d7c1eb8fd4d546f4b2ef778ae575c5 | |
| parent | ff41a846a47d3de8843c9150c237a387bd5b1ed7 [diff] | |
| parent | 318a0601909b77ac68607cddc6d87eea5e32c3b6 [diff] |
am 318a0601: (-s ours) am 41d5cb0c: (-s ours) am b5ad15ae: (-s ours) Import translations. DO NOT MERGE * commit '318a0601909b77ac68607cddc6d87eea5e32c3b6': Import translations. DO NOT MERGE