| commit | 7011e6de324ae4e14086616d91b1892f77d2c503 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 16:52:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 16:52:32 2015 +0000 |
| tree | 2c17ae160b39accbc6f7ab5f6d8562bd3982f87e | |
| parent | ce17cd28caee70b361a1b70c3ae5817714ab47ea [diff] | |
| parent | f221299b2253d941ca39f0f4cb3a09b6a5508962 [diff] |
am f221299b: (-s ours) am d6d398e6: (-s ours) Import translations. DO NOT MERGE * commit 'f221299b2253d941ca39f0f4cb3a09b6a5508962': Import translations. DO NOT MERGE