| commit | 8a881b8bb12ae3feacf0ef684cc8dccdb91753d7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 22 15:40:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 15:40:52 2014 +0000 |
| tree | fa2094cdf40e42020af77110031edbadc1b2ccd4 | |
| parent | cd25179a3da4c4f7f94b6ca76a642afa836a0de2 [diff] | |
| parent | 50e443922d0fe7cf17b6c21c3035341c12b622f6 [diff] |
am dd5a5881: (-s ours) am 6766feeb: (-s ours) am f02db281: (-s ours) Import translations. DO NOT MERGE * commit 'dd5a5881496b4a831c5466ab4d26d2858c9c66b7': Import translations. DO NOT MERGE