commit | 6db9c03dc37f48b056d2cdf68f7c7a1cf9d4820a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed May 27 14:30:19 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 27 14:30:19 2015 +0000 |
tree | be6bcf711df701f72e998ba6ff9257bd2e6b5ee2 | |
parent | 0281872a7ed4dca4504a4bc2c894247756929332 [diff] | |
parent | 041c469d9694377bf36296903e48571e2876b0d5 [diff] |
am 041c469d: (-s ours) am d56fdd20: (-s ours) am 5e7c1682: (-s ours) Import translations. DO NOT MERGE * commit '041c469d9694377bf36296903e48571e2876b0d5': Import translations. DO NOT MERGE