commit | 78d1900b62d5973376993b70ae6ac00f5dbbaea0 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 22 21:08:26 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 21:08:26 2014 +0000 |
tree | 98b7c1fad6d309c425feff705c757b24c985a2b8 | |
parent | 995cebd3136f897de0a64873e402ca40cb01e503 [diff] | |
parent | b54c100efcca875debb53b16ac03eeb81070c5e6 [diff] |
am b54c100e: (-s ours) am 6ba0977d: (-s ours) Import translations. DO NOT MERGE * commit 'b54c100efcca875debb53b16ac03eeb81070c5e6': Import translations. DO NOT MERGE