tree aeb221ba92215ab5dc593801b4d821c8b3457be3
parent 2cb3e83654c99e202c170d9d0237d8d1f4054354
parent 3a94b7c12161ebbfba9919e10f7ea65a8ef41046
author Eric Fischer <enf@google.com> 1283882606 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1283882606 -0700

Merge "Preserve old translations for changed strings.  DO NOT MERGE" into gingerbread