commit | 460bf98463a34905eb1a00b9c986647a573bb89d | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 07 15:24:45 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 15:24:45 2014 +0000 |
tree | 946f873c74956dce20dd1f268617c56aeb492444 | |
parent | 1117e26c337f3a828f76690830c0468062f7b6f5 [diff] | |
parent | 9cf06403a3503dd2f70319c3f80b28618bc4e55b [diff] |
am 6eef366a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '6eef366a7d4c287446e10e19de13999af4788c99': Import translations. DO NOT MERGE