| commit | c851c7ee3bd83e8fffda607ec8cbdd3f42e9f61e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 23:50:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 23:50:23 2014 +0000 |
| tree | d28156def10cd8508d81c1808bbc1aa9fa6eb2a5 | |
| parent | 2ea7b35b82b50c593e3feeec8e44521dfcbb29e3 [diff] | |
| parent | 63b19d0fa0231c5a3aca2e49d35cf497562f4f22 [diff] |
am 63b19d0f: (-s ours) am b8544c3f: (-s ours) Import translations. DO NOT MERGE * commit '63b19d0fa0231c5a3aca2e49d35cf497562f4f22': Import translations. DO NOT MERGE