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