commit | d3403e45d6d89d0307c0fc9427cc84792ac6ee83 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Jan 15 23:45:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 15 23:45:54 2015 +0000 |
tree | 93f067599f4891c5d0629df9e1a5b1b9a2c977c3 | |
parent | 41d54237380d5f3c06ab2a71715e22f048278ecf [diff] | |
parent | faf92d725649337a29312603dc8c10a3f0ee103a [diff] |
am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'faf92d725649337a29312603dc8c10a3f0ee103a': Import translations. DO NOT MERGE