| commit | d1c4bf61076871947c7dff35b21b6aac75d4e590 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Mon Apr 30 13:13:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 30 13:13:34 2012 -0700 |
| tree | 56d77d326e127d241199f63ea06f8015a9714320 | |
| parent | 5e925ae3c785aa98f7d6b3c079c938d25008badd [diff] | |
| parent | fb2ea77112803842c1aa5892c3d08d9927cea5cf [diff] |
am 642ed688: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '642ed688019936b7bab712977f30c28659da63cb': Import translations. DO NOT MERGE