tree 28bd1f2be3f13d989070854edced68e30ba520ab
parent 4f71b25cc958ff25ed5943620d03079bc1fcfb5e
parent 3b4e7609c1f09b0471e414ef516e42454c8c1255
author Eric Fischer <enf@google.com> 1318963693 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963693 -0700

am 3b4e7609: (-s ours) am e071e0b3: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '3b4e7609c1f09b0471e414ef516e42454c8c1255':
  Import revised translations.  DO NOT MERGE