commit | e2a537f23517c0d7e222124bd2ae49997da1620e | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Sep 07 11:14:28 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 07 11:14:28 2010 -0700 |
tree | 9d9953dc0da5b09d871b38ff4848e284be54816f | |
parent | 85a033af1ad0bac82e1ee884bb57356a74e42ced [diff] | |
parent | aab7375799e76ec2e429fbd8224d0c6e8cc96463 [diff] |
am aab73757: (-s ours) am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread Merge commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463' * commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463': Preserve old translations for changed strings. DO NOT MERGE