| commit | 4820298bf32941f88c66d7ff90d5898db33cd709 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Jun 29 18:02:44 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 29 18:02:44 2012 -0700 |
| tree | 6c77479c8cdd5dcaf2d2b1a300215d220d7fa6e8 | |
| parent | 2e943441c2f186a57dfb1e991203e408daaeeb1b [diff] | |
| parent | d15183a971590ca0e32bc78c8ed2a3470009fbae [diff] |
am d15183a9: (-s ours) am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'd15183a971590ca0e32bc78c8ed2a3470009fbae': Import translations. DO NOT MERGE