| commit | 895e581eb1f8a544959b71baa87e26ca5d6a7478 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:48 2015 +0000 |
| tree | 154754ae93c303656f7b8f6b4a0ea5c346533101 | |
| parent | 8d514d852d1cf48f1dfadb2acc677b30e5b1cecb [diff] | |
| parent | 521e442b90ee20368be5d4dd33ec67e1f89872c7 [diff] |
am 521e442b: (-s ours) am 040b8559: (-s ours) Import translations. DO NOT MERGE * commit '521e442b90ee20368be5d4dd33ec67e1f89872c7': Import translations. DO NOT MERGE