| commit | 36a58ecb8d978f927a418e4c9719b0609b066a6f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:56:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:56:00 2015 +0000 |
| tree | 547117f668ea31f8424844206e27f34c81ed9547 | |
| parent | 8bcfdb707fb4ac8c44ec1f2c7483e35d5854e295 [diff] | |
| parent | 447a1008c638706092aae7620079060ec3a0c74c [diff] |
am 447a1008: (-s ours) am 650418e5: (-s ours) am f288f992: (-s ours) Import translations. DO NOT MERGE * commit '447a1008c638706092aae7620079060ec3a0c74c': Import translations. DO NOT MERGE