| commit | e8946d3a079289597c9293e2dd6b0ebebdd4b34f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:41:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:41:53 2015 +0000 |
| tree | d76396522d6dc89a983aa7d3ae230e0aca75b148 | |
| parent | 00a5b07418988d361a17b512d58eb17cf9dd2e30 [diff] | |
| parent | 7f8dde71857bb3bc6fc72b646988ce1f7f31f94e [diff] |
am 7f8dde71: (-s ours) am 12eae246: (-s ours) Import translations. DO NOT MERGE * commit '7f8dde71857bb3bc6fc72b646988ce1f7f31f94e': Import translations. DO NOT MERGE