| commit | 6b216ea0f9c15265225fb17d5e03001f59c581cc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Dec 09 00:58:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 00:58:44 2014 +0000 |
| tree | 5a8fe4564e5cbaee6fbdbcd7ff766a2ecd1b7a26 | |
| parent | f0540a203e96d90747aedfdb633264b10fea3c3f [diff] | |
| parent | 4e0765671f93fa7b762bdb6143a9c014429a0b85 [diff] |
am 4e076567: (-s ours) am a356f33a: (-s ours) am 1dacd19e: (-s ours) Import translations. DO NOT MERGE * commit '4e0765671f93fa7b762bdb6143a9c014429a0b85': Import translations. DO NOT MERGE