commit | 39a4e9de2d77042390abb2e33669d53f53bc2450 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Mar 09 15:49:29 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 09 15:49:29 2015 +0000 |
tree | 185b1e30aa0b03b50f33e475c2c094226bc65275 | |
parent | 2a18cbcffaa7e8e34f7cd8b91e930eb2c08a6ef6 [diff] | |
parent | e88afe3ee7b1944c8814f78f0eea41884d07600d [diff] |
am e88afe3e: (-s ours) am 146990b7: (-s ours) Import translations. DO NOT MERGE * commit 'e88afe3ee7b1944c8814f78f0eea41884d07600d': Import translations. DO NOT MERGE