| commit | ed6db520b8a14786b7456e260ed72377f8900e88 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Feb 25 17:12:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 17:12:23 2015 +0000 |
| tree | 6182b2630b2254a6ad010ecb6a77aa8cc5fcf385 | |
| parent | 336beed4d1006211139ab0b8e34227b364f17899 [diff] | |
| parent | 6d471d04b086d6d21b2e01f2368ec02af36d9970 [diff] |
am 6d471d04: (-s ours) am a4f54454: (-s ours) Import translations. DO NOT MERGE * commit '6d471d04b086d6d21b2e01f2368ec02af36d9970': Import translations. DO NOT MERGE