| commit | a5636a98bcbb5ccb0fc5e0d7dac6494b6187f44c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 16:44:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 16:44:09 2015 +0000 |
| tree | 309cb795801ace7e0adea93bab906d74cb107224 | |
| parent | 0eb11ebe60e1a156bd506735ceb61f7367bae9e5 [diff] | |
| parent | 16171454f5c71955b765e8ab9bd9adbc094dca72 [diff] |
am 16171454: (-s ours) am 78d41d21: (-s ours) am b72e493b: (-s ours) Import translations. DO NOT MERGE * commit '16171454f5c71955b765e8ab9bd9adbc094dca72': Import translations. DO NOT MERGE