commit | 970321cfbe1fa977c83bb4d15986ff3f9facd516 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Nov 12 23:40:31 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 23:40:31 2014 +0000 |
tree | 3f32c9747e87316dcab6398b0d2f01aa8352c7f9 | |
parent | 3997071f3e118701eb8dfbf2c25457e2cf77a3af [diff] | |
parent | 29715a292adc74e92ae2aa43b145ac5cdf6aa007 [diff] |
am 29715a29: (-s ours) Import translations. DO NOT MERGE * commit '29715a292adc74e92ae2aa43b145ac5cdf6aa007': Import translations. DO NOT MERGE