| commit | 35aa960e139f0fc65637ce3d2847b4005b65075b | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Feb 10 10:10:31 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:10:31 2012 -0800 |
| tree | 362afa1a0fcf17419a89a14a13eb61aec9d43efc | |
| parent | 7c11e9f276c856204b7fd9c6ce0e47ca0989bde9 [diff] | |
| parent | bae08f2f1ae15155e9c4467b805ff3a0c156e6fd [diff] |
am bae08f2f: (-s ours) am c2fa43fe: Import translations. DO NOT MERGE * commit 'bae08f2f1ae15155e9c4467b805ff3a0c156e6fd':