commit | 8dc4e71009aae8f78f4cb44fd17e1d5365ee03c5 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:53:31 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:53:31 2015 +0000 |
tree | 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d | |
parent | 82df3a03fd954fd9b1cca1fb7dc2a0ed415b791b [diff] | |
parent | a5698f209dc9d79382233db011810f8e8f88c2c2 [diff] |
am a5698f20: (-s ours) Import translations. DO NOT MERGE * commit 'a5698f209dc9d79382233db011810f8e8f88c2c2': Import translations. DO NOT MERGE