| commit | 725cdd9e6a7a96a68da1620d48842cf54a338e6d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon May 25 14:04:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 25 14:04:05 2015 +0000 |
| tree | 884d992ca4cfa7df4e23a225136db70a9176c76f | |
| parent | 314bf5244b87b4d29d84845ba2a8beccf9607cf6 [diff] | |
| parent | e4b39596433f705e5d0e1a06ccabcc9772d365b5 [diff] |
am e4b39596: (-s ours) am e3dde1bf: (-s ours) Import translations. DO NOT MERGE * commit 'e4b39596433f705e5d0e1a06ccabcc9772d365b5': Import translations. DO NOT MERGE