| commit | e6d06aeb2c5d2a70f71aa1a5365eb2dea46692d8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Aug 28 10:20:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 28 10:20:47 2015 +0000 |
| tree | b1a815d5d6d82cd73a4098aecddc093fd9161354 | |
| parent | e053491bcc55ce844cd1f38dc61dac7edc15750a [diff] | |
| parent | 2751a8cf319c58f83564ff9eb5efbf5b32d2dc7f [diff] |
am 2751a8cf: (-s ours) am db044ffb: (-s ours) Import translations. DO NOT MERGE * commit '2751a8cf319c58f83564ff9eb5efbf5b32d2dc7f': Import translations. DO NOT MERGE