| commit | 650418e5a76e96bb03b5839a8a4ec36dd2106131 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:09:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:09:30 2015 +0000 |
| tree | 7228ba5307c403204726c8ed9cb5e5a1daa3425c | |
| parent | eb6babec2015ee741a01aa2890356f834d497ca5 [diff] | |
| parent | f288f992f8920f2f159bd60fb3d32d58cfcfd064 [diff] |
am f288f992: (-s ours) Import translations. DO NOT MERGE * commit 'f288f992f8920f2f159bd60fb3d32d58cfcfd064': Import translations. DO NOT MERGE