| commit | 439ed2085635459c3a1d39e483168e15ee892cd3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:37:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:37:47 2015 +0000 |
| tree | 466eabd9fb9bc9bb3962647ab583e7bad505e918 | |
| parent | d6557581541f067035aaa0a39febdf719a4e8946 [diff] | |
| parent | dbf4d24cc758e9203aa519784bc784e937c2664d [diff] |
am dbf4d24c: (-s ours) am 72c3d940: (-s ours) Import translations. DO NOT MERGE * commit 'dbf4d24cc758e9203aa519784bc784e937c2664d': Import translations. DO NOT MERGE