| commit | ad36aa0ed1b7ba2541d28bc447473e27f3d04e22 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 07 12:56:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 12:56:45 2015 +0000 |
| tree | 87370aa6a2e69e8024fc6f3f46458e2bb878d9bb | |
| parent | b4a027d07bdd6b488a0ca576f7369beb0cad17c6 [diff] | |
| parent | 3963b980bebacb58dd2ed57fd45b042a01f125a0 [diff] |
am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE * commit '3963b980bebacb58dd2ed57fd45b042a01f125a0': Import translations. DO NOT MERGE