tree 986125769dcc5027cf2b56e72e034af35f60d8a1
parent 23501017cb6aa2661b61195c6966274711a0f6c6
parent 949ed90320462fa502c534293f602ea9ed257fee
author Eric Fischer <enf@google.com> 1321537887 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537887 -0800

am 949ed903: am 6fe22531: (-s ours) am b655d545: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '949ed90320462fa502c534293f602ea9ed257fee':
  Import revised translations.  DO NOT MERGE