| commit | 56cfcbdd0b0adb33c7ab325022ce8d3698059b60 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 17 13:11:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 13:11:55 2015 +0000 |
| tree | c560330f63f0d44302791c6c42268f18c5732def | |
| parent | 97717552a455df152e90735fd3635c1e5b049197 [diff] | |
| parent | 09365362dfcea82652e9e32f0596aa89ec3bbf04 [diff] |
am 09365362: (-s ours) am 281907b5: (-s ours) am 3447541c: (-s ours) Import translations. DO NOT MERGE * commit '09365362dfcea82652e9e32f0596aa89ec3bbf04': Import translations. DO NOT MERGE