commit | 9572fffe1cb9e6dacc485091dac87a3eceabf251 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:22:26 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:22:26 2014 +0000 |
tree | 7ba0d051a38199ccc70f000f25c80efb4647d5b2 | |
parent | 4d4d95dd4dd42c557254131dc6e6df6bc6e2e805 [diff] | |
parent | 6b82b2fc1d5baa2ac233168ed860ecbac3e0c74e [diff] |
am 6b82b2fc: (-s ours) am 651361ce: (-s ours) am 29dfdb59: (-s ours) Import translations. DO NOT MERGE * commit '6b82b2fc1d5baa2ac233168ed860ecbac3e0c74e': Import translations. DO NOT MERGE