| commit | b96d5cacd131e7d69249caa0dfa6813d65e89788 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 17:15:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 17:15:48 2015 +0000 |
| tree | 64275bfebb19faff023d7119e333b140263eb2c5 | |
| parent | c6c574e4877c39697d5085260ee1ae62561caa84 [diff] | |
| parent | 7b680c50115959bbbd74624f64a8eeaf155656ee [diff] |
am 7b680c50: (-s ours) am 439ed208: (-s ours) am dbf4d24c: (-s ours) am 72c3d940: (-s ours) Import translations. DO NOT MERGE * commit '7b680c50115959bbbd74624f64a8eeaf155656ee': Import translations. DO NOT MERGE