| commit | 158ce5ce84e4226118e8e2102cb712cfd77dfb21 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 13:43:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 13:43:11 2015 +0000 |
| tree | 999ec56c09b7f188e75f6dcb40b3b779a0cb60f2 | |
| parent | 1bb57890a25e895f9b27ef557ca6a2f83dee8812 [diff] | |
| parent | 689721da0c87d8dddb6354aaef58d4d7cc0826e5 [diff] |
am 689721da: (-s ours) am 77b6b0eb: (-s ours) Import translations. DO NOT MERGE * commit '689721da0c87d8dddb6354aaef58d4d7cc0826e5': Import translations. DO NOT MERGE