tree c92668df609916a8fcab1e3cf01bce8cf911d585
parent 323ed2b5d16cd7c3d102a6e9a514fa49b8245dc6
parent a0dd81179d6464d04d12c1732396503a1a5334b3
author Eric Fischer <enf@google.com> 1319135675 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319135675 -0700

am a0dd8117: (-s ours) am 5b2bbb74: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

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