commit | 8066fd795576606a7f151e45210fba6bd6fa45e6 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:44:28 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:44:28 2014 +0000 |
tree | 9d9e5bc445cbf3999397f7f8a1528458ec2f3380 | |
parent | f02927a2ace1c00d8235cf4f0e23ea75fa402ced [diff] | |
parent | fab23cfa4e9d952b7cf0d0f80dfc3371a8c78dfd [diff] |
am fab23cfa: (-s ours) am 847d8e2d: (-s ours) am b9925c43: (-s ours) am c4868dea: (-s ours) Import translations. DO NOT MERGE * commit 'fab23cfa4e9d952b7cf0d0f80dfc3371a8c78dfd': Import translations. DO NOT MERGE