| commit | 6b8c18af3e31d46f0a0d8a53d6444e058285cb8d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed May 14 00:07:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:07:25 2014 +0000 |
| tree | c2175942e3a631ad112fe6ab17da560c45fc1ae2 | |
| parent | cd6362f83e02aa0494e97e39213d18fbf73f6171 [diff] | |
| parent | 87bb17226ef9cbdc0a49628b57ca48152d8513ca [diff] |
am 87bb1722: (-s ours) am 87cf81d2: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '87bb17226ef9cbdc0a49628b57ca48152d8513ca':