| commit | 987ab85fe13de9ca47bd46ee8c7be7de90ec1347 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Feb 10 10:15:33 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:15:33 2012 -0800 |
| tree | 6a66928ba0f67289546e1f12b28b49b6913e7ef4 | |
| parent | fe62e1b1963aa9268e84d42efe9d9abdf7021725 [diff] | |
| parent | c12a5011a5e369a85d5944ab0cf8ea6275f0b339 [diff] |
am c12a5011: (-s ours) am bb5aa487: am 077cf819: Import translations. DO NOT MERGE * commit 'c12a5011a5e369a85d5944ab0cf8ea6275f0b339': Import translations. DO NOT MERGE