| commit | 82780aa20857e80f31276508ea94061de21faebb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 06:11:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 06:11:18 2015 +0000 |
| tree | 682c9573bbb35c71951b67674471ed8c3501ef8f | |
| parent | 4a8995a336febc339cc9b61f166d46830127d81e [diff] | |
| parent | 6308e69707a7034e80d403f164580cd4b4d9f8cc [diff] |
am 6308e697: (-s ours) am 9f162c07: (-s ours) am e04a4b50: (-s ours) am b7d77afc: (-s ours) am a8f551b5: (-s ours) Import translations. DO NOT MERGE * commit '6308e69707a7034e80d403f164580cd4b4d9f8cc': Import translations. DO NOT MERGE