| commit | 03557f85901dd4c42be3a5283bafcf08e3239cf7 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Jul 13 14:04:49 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 13 14:04:49 2012 -0700 |
| tree | e29fb7a77e4aab23b101ef49d6f6f0096f8206cf | |
| parent | b47e427f72344ac0a3449bbb205622481b2cea5e [diff] | |
| parent | fc567c2665da9d093bf3dd6868b7618f96c83183 [diff] |
am fc567c26: (-s ours) am 4b25c5ad: Import translations. DO NOT MERGE * commit 'fc567c2665da9d093bf3dd6868b7618f96c83183': Import translations. DO NOT MERGE