tree ee58d051a9bf05de1c7fe2c8b77f70569d411b5c
parent c110e2718fa93b4663d493387ecd8602170dfa36
parent bdd7f5925c565b2e7943c66172120b5da5821409
author Eric Fischer <enf@google.com> 1321938736 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938736 -0800

am bdd7f592: am e7299c80: (-s ours) am 31186d05: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'bdd7f5925c565b2e7943c66172120b5da5821409':
  Import revised translations. DO NOT MERGE