| commit | d008f0b74130496d6b80728b688cadb7e078d6ed | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 01:47:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 01:47:37 2014 +0000 |
| tree | 3aafc2eaebdde9c26f5b67c2f08982664424781d | |
| parent | c8a8701c2ecf05aad45d385b7acb084b55b90eb4 [diff] | |
| parent | c71a7b3cb8eb1565c01caaf231773759ee63b4cf [diff] |
am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c71a7b3cb8eb1565c01caaf231773759ee63b4cf': Import translations. DO NOT MERGE