| commit | 8f89a1fba49fec29fec935240e5340ae4c979e81 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:37:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:37:20 2015 +0000 |
| tree | 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d | |
| parent | 46ce534894cdb8eab7f69988882be751ebfba39c [diff] | |
| parent | 0763101a0920575737efab126d56c1eda091b09e [diff] |
am 0763101a: (-s ours) am 10a0dc21: (-s ours) am 4d9ee901: (-s ours) am a5698f20: (-s ours) Import translations. DO NOT MERGE * commit '0763101a0920575737efab126d56c1eda091b09e': Import translations. DO NOT MERGE