| commit | d50f67e320187ae38fa272baefc018b0b01fa7a2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 15:16:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 15:16:57 2015 +0000 |
| tree | 3a88203e844418d8804e94cd44c14a9cb99482c9 | |
| parent | ea23b32e942eb13fabb404a35a1bf7d797ec2d33 [diff] | |
| parent | 2ea1ea3b52462690e59abc5e55ac05617fe4d30c [diff] |
am 5330ed16: (-s ours) am 37029d3a: (-s ours) Import translations. DO NOT MERGE * commit '5330ed163b34aa343e0926f35a8f84ec8be5046a': Import translations. DO NOT MERGE