| commit | 5d9765c93da85ee6ce6fe2c38bc890dd4dfb48f1 | [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 | 365957e2f10f97798d21ec768eca47c686f90315 | |
| parent | 0354109ac2c7b915241e2a1e2765f7e8d95dee51 [diff] | |
| parent | ff154165d7485bdb5e4e0bf9854e5ba7f70756a2 [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