tree 8db44374c456d8629150fe944a90808982f3fd24
parent cbe66ba70da6bfaf4b0ba922a0cd4d76d7bff094
parent 90ec2f43f14f037f5962df6a02e2aa48f2f60a3b
author Eric Fischer <enf@google.com> 1322602571 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322602571 -0800

am 90ec2f43: am ffd5c57b: (-s ours) am 3924df85: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '90ec2f43f14f037f5962df6a02e2aa48f2f60a3b':
  Import revised translations.  DO NOT MERGE