| commit | cfa5102dd74cb64d89c51ccfb831e98c09b13327 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Jun 08 16:46:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 08 16:46:35 2012 -0700 |
| tree | d4f9fca0c78a5e24a390969890de59df80729f84 | |
| parent | d208c1b8c96c9db5764d29d4e7b61443de40470c [diff] | |
| parent | 4bdf62727ef2c7c815dc2a217b49ef147b4d3d7d [diff] |
am 4bdf6272: (-s ours) am d9038fd5: Import translations. DO NOT MERGE * commit '4bdf62727ef2c7c815dc2a217b49ef147b4d3d7d': Import translations. DO NOT MERGE