| commit | 019b222d8e5a68c413fc040e7e7049f27a66f60a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:09:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:09:01 2014 +0000 |
| tree | 0704082f6023aa4a254e32609792141d1b887433 | |
| parent | 2bcb9879125d33ec596e78edf0441f7f0a53a91e [diff] | |
| parent | ce84186e6b89d458f6252452eeec36fe13dbbfcb [diff] |
am 6fd7f435: (-s ours) am dd200258: (-s ours) Import translations. DO NOT MERGE * commit '6fd7f4355c349731319c8952c53ebe916c5e66b6': Import translations. DO NOT MERGE