| commit | 94b11365faf2b96ec8c4a26c5b66d242dbdd99a4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:59:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:59:44 2014 +0000 |
| tree | ac1420553126c7167abcc6673ec0d68499e881fa | |
| parent | 155e90e8f6d53218a132f641583ad3a1c4ea9769 [diff] | |
| parent | 6e81f5fcf51c37275cfe006c820a06d8517a3cce [diff] |
am 6e81f5fc: (-s ours) am 9735cbd1: (-s ours) am 29be6698: (-s ours) Import translations. DO NOT MERGE * commit '6e81f5fcf51c37275cfe006c820a06d8517a3cce': Import translations. DO NOT MERGE