| commit | 4764543b6337770a59b5f243cb66a9ab0ebe9712 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 12:47:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 12:47:50 2015 +0000 |
| tree | b25f70046defe98154c919dd25e9b937b082506d | |
| parent | 978a9fddde74bed4e542d22aedb442cf20e7a888 [diff] | |
| parent | 87a3258c2bb1d7d0c5c99adf4adb1788f30d54cf [diff] |
am 87a3258c: (-s ours) am 8a6e597d: (-s ours) Import translations. DO NOT MERGE * commit '87a3258c2bb1d7d0c5c99adf4adb1788f30d54cf': Import translations. DO NOT MERGE