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