| commit | a57e72eaf40ab153ec06c51716d42102de1b311f | [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 | 74f88cb0e90082cd357f603b6025281e6b616ff7 | |
| parent | f9d3df5a582328d90d2ba7cfd24f603b51c482c6 [diff] | |
| parent | 2e68425ec2364490dc77b91c8f06b672033e00db [diff] |
am 2e68425e: (-s ours) am a167e65c: Import translations. DO NOT MERGE * commit '2e68425ec2364490dc77b91c8f06b672033e00db':