commit | 2a5f0b4e3b144fa536c69cb80831b4a8678cc855 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Dec 10 14:33:06 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 14:33:06 2014 +0000 |
tree | 53d03b53c86b5106c13ae58c5f51b7b67650e982 | |
parent | 9309db894df916f0777745eaa3e41ab92930481d [diff] | |
parent | b7180c450e8364077f37f792160c94941d8839c6 [diff] |
am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b7180c450e8364077f37f792160c94941d8839c6': Import translations. DO NOT MERGE