commit | 7eff88e2ea354685affabca75373872e565b3d99 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 01 02:08:20 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 02:08:20 2014 +0000 |
tree | b9b72efd4dac76169c92428c0d2cdbac7acfc921 | |
parent | 01eec403726db8aced447e9d6780889753c0f149 [diff] | |
parent | 304bca817237e050ebd530dd5db990329f3f7235 [diff] |
am 304bca81: (-s ours) am ca87a6c9: (-s ours) am ab4963b8: (-s ours) am 5dd9e4ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '304bca817237e050ebd530dd5db990329f3f7235': Import translations. DO NOT MERGE