tree 8db44374c456d8629150fe944a90808982f3fd24
parent b21dd31b6f1242b0309eee1b48966174ae35768f
parent ffd5c57b9206b755037a9e7aeea920997624ff06
author Eric Fischer <enf@google.com> 1322602362 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322602362 -0800

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

* commit 'ffd5c57b9206b755037a9e7aeea920997624ff06':
  Import revised translations.  DO NOT MERGE