tree 67d3d7311ca1bdb6544aa412e9fc1b752cdaf7a6
parent 164babc69ce3302e2f90f5621a3f9761bbb5148b
parent 8a5ca4e5854a3a1e802a9dce7942a3c9a8055407
author Eric Fischer <enf@google.com> 1317160680 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317160680 -0700

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

* commit '8a5ca4e5854a3a1e802a9dce7942a3c9a8055407':
  Import revised translations.  DO NOT MERGE