tree ab67fa053999f574df4b944131d37609f331db41
parent 1ce5ca8c7fbc56ae05fa934ada27bbf4e5392f1c
parent 001b0126dbb73ce0f15c3e6fd690fff39383466e
author Eric Fischer <enf@google.com> 1320256368 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320256368 +0000

am 001b0126: (-s ours) am 7eb9220a: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '001b0126dbb73ce0f15c3e6fd690fff39383466e':
  Import revised translations.  DO NOT MERGE