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