| commit | 27e3514e55df90ee183d939ef10b18a4bf773bce | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 30 15:03:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 30 15:03:29 2015 +0000 |
| tree | 4e385084f4b557d2d56a6cd62940c5f4cc20d5d4 | |
| parent | 20ec48bd0037108a4b2273ef6fa38d7562f33c56 [diff] | |
| parent | b64b78856cf6121e9956f8910f30656ebde5d024 [diff] |
am b64b7885: (-s ours) am 6e22b329: (-s ours) am 6e6250b9: (-s ours) Import translations. DO NOT MERGE * commit 'b64b78856cf6121e9956f8910f30656ebde5d024': Import translations. DO NOT MERGE