| commit | e0c33c8e2412ca136bdf213cbd1df4def1c1911e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:34:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:34:07 2015 +0000 |
| tree | e08d4f8a67694164b4a680b547a1874b115d40d0 | |
| parent | 0dfba36e53aec543829653e2ea0be8c3f9a2cd8f [diff] | |
| parent | 9698368557fc3db6880873bd83b9a39a9dcbebc5 [diff] |
am c0ed8592: (-s ours) am a97c6b2f: (-s ours) am 98e8117e: (-s ours) Import translations. DO NOT MERGE * commit 'c0ed8592d5c88d803d8c2f58fb32407015a55024': Import translations. DO NOT MERGE