commit | 25b5330582b318282ed02ec8f2f34d5a9fda4c15 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Apr 29 21:10:19 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 29 21:10:19 2014 +0000 |
tree | e30ca8bd79b53838e2e7f91969bd5fefc35a85a2 | |
parent | 10bc71115ed716193dc71a39dd555bd999d30d48 [diff] | |
parent | 737c4943eb9dbc9dc9e8f4fc423b2ee8325e1fc3 [diff] |
am 737c4943: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '737c4943eb9dbc9dc9e8f4fc423b2ee8325e1fc3': Import translations. DO NOT MERGE