| commit | c90aa638f6465f383e40b2063d38496aab7b8914 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 09 17:01:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 09 17:01:37 2015 +0000 |
| tree | 17a81ddea147d7a3c586adc58bce940a61f75cfa | |
| parent | 89d0c0fbaec976b8b06c81a2950aed3a3c5e5b1b [diff] | |
| parent | 535bf0f8e5034a9a21755df6cf158a4b95e857aa [diff] |
am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGE * commit '535bf0f8e5034a9a21755df6cf158a4b95e857aa': Import translations. DO NOT MERGE