tree 67d3d7311ca1bdb6544aa412e9fc1b752cdaf7a6
parent 0e0abff57f791c5bc308f1bef7f7074107c98541
parent 667a770068ce0c3713367cbec15fe5a515bef62f
author Eric Fischer <enf@google.com> 1317176381 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317176381 -0700

am 667a7700: (-s ours) am 8a5ca4e5: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

* commit '667a770068ce0c3713367cbec15fe5a515bef62f':
  Import revised translations.  DO NOT MERGE