| commit | f8fe99a1d298015cc968ce019454f079f72f1ecf | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Feb 10 10:15:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:15:32 2012 -0800 |
| tree | 74f88cb0e90082cd357f603b6025281e6b616ff7 | |
| parent | b02496ccd93f12200d2b204c0464e3f19d316982 [diff] | |
| parent | a57e72eaf40ab153ec06c51716d42102de1b311f [diff] |
am a57e72ea: (-s ours) am 2e68425e: (-s ours) am a167e65c: Import translations. DO NOT MERGE * commit 'a57e72eaf40ab153ec06c51716d42102de1b311f':