| commit | 4785ba546595612f7889f5cc02d4c7351bec47ee | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:41:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:41:19 2014 +0000 |
| tree | 89b98d03c43fd923c89a8f375e97c603ff980fd0 | |
| parent | 5267d8ae92f16b275f61e1e20bbcc8e9c48d5613 [diff] | |
| parent | 7bfa5f75d635d81bb161a688ec757f1fe1b93f87 [diff] |
am 7bfa5f75: (-s ours) am 0ba5a499: (-s ours) Import translations. DO NOT MERGE * commit '7bfa5f75d635d81bb161a688ec757f1fe1b93f87': Import translations. DO NOT MERGE