| commit | 0cec40628bae261e2e378495dcdd4966179dacd2 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Sep 07 11:14:50 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 07 11:14:50 2010 -0700 |
| tree | 79e94621be2e5fedd368b016d14c6416e57c89c4 | |
| parent | dadf7c378e059d6f2e2ebb4bf6d6569eaea94dbe [diff] | |
| parent | 11bf335adb109a63ac3e1ea17ee9f61909708c0b [diff] |
am 11bf335a: (-s ours) am 1a886f80: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread Merge commit '11bf335adb109a63ac3e1ea17ee9f61909708c0b' * commit '11bf335adb109a63ac3e1ea17ee9f61909708c0b': Preserve old translations for changed strings. DO NOT MERGE