| commit | 8280c02815bcfac43117a68690533716a3b5a936 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 14:33:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 14:33:53 2014 +0000 |
| tree | 904ec9eb365538be19b768ed1790f324a64c8b1e | |
| parent | c0adb6e5383022b6be6dc6e6f72f1a2285cf5baf [diff] | |
| parent | 0decca8e703695ff7e44e1ee16c16af622234cd4 [diff] |
am 0decca8e: (-s ours) am 79233976: (-s ours) Import translations. DO NOT MERGE * commit '0decca8e703695ff7e44e1ee16c16af622234cd4': Import translations. DO NOT MERGE