| commit | ed6bee8c7b29856f3b0f2bf7c32ba04d1eeff77f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 17 12:59:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 12:59:50 2015 +0000 |
| tree | 42fca762485705b690026b77fa7c5102c4c4b5ae | |
| parent | 188950b4a717d32a67032282c000a5f2ce178955 [diff] | |
| parent | 7804882ca51d44e04a0b82b9fc4bc2db8a37fba5 [diff] |
am 7804882c: (-s ours) Import translations. DO NOT MERGE * commit '7804882ca51d44e04a0b82b9fc4bc2db8a37fba5': Import translations. DO NOT MERGE