| commit | a462b2862a8694ba76ea7ee9047eab5ce7a2f769 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Sep 30 12:38:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 12:38:10 2015 +0000 |
| tree | 4e8400a1a07b08c54552f30bfcde25a87ceda5d5 | |
| parent | bb60d4dc826d39317f4599b8f8183a22d75e6c3f [diff] | |
| parent | 99842468d307709cc90414339aa7ddab2f08c855 [diff] |
am 99842468: (-s ours) am afc38312: (-s ours) am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE * commit '99842468d307709cc90414339aa7ddab2f08c855': Import translations. DO NOT MERGE