| commit | bd1404519ca3dbe033250e2c4ae28e1c00a9ca2c | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Jun 22 15:04:22 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 22 15:04:22 2012 -0700 |
| tree | db52c9c3983b7e2a0186de92e4eb1e96d83933b6 | |
| parent | 604d3eb76a33a3b627ce1ec2be2c2b0669ed5ad0 [diff] | |
| parent | 5539e720b45418e5d159a66beb29e38044a5f733 [diff] |
am 5539e720: (-s ours) am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '5539e720b45418e5d159a66beb29e38044a5f733': Import translations. DO NOT MERGE