| commit | 6e8cc2cb8d38cc9d75d00029b2c6acb1140ea6db | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Sep 21 13:12:51 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 21 13:12:51 2010 -0700 |
| tree | 90afa1c1c7c9a764b9bb8cba73cac53d2660cb90 | |
| parent | fd638951d6aa4a4cee6872bd65cb5b2355cd2968 [diff] | |
| parent | daaf7094e951e8fe4923ba0ec9f61ab784b45c50 [diff] |
am daaf7094: (-s ours) am e5823b2c: am eb8fc4a0: (-s ours) Import translations for search engine setting. DO NOT MERGE Merge commit 'daaf7094e951e8fe4923ba0ec9f61ab784b45c50' * commit 'daaf7094e951e8fe4923ba0ec9f61ab784b45c50': Import translations for search engine setting. DO NOT MERGE