tree 51a644168ccc6cf56ae057bc6dc88053c805bc2c
parent 6d041a5d90f6fb7c3d8bf35becfbd96ba685b728
parent 53c67ee6cbd08c2afa313e7f0d25a5a3e1129c8e
author Eric Fischer <enf@google.com> 1316558445 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316558445 -0700

am 53c67ee6: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

* commit '53c67ee6cbd08c2afa313e7f0d25a5a3e1129c8e':
  Import revised translations.  DO NOT MERGE