tree ee58d051a9bf05de1c7fe2c8b77f70569d411b5c
parent 9a03678e12909c663ee856976d50fd38c8ab6945
parent e7299c80ad876e951c3f85d3a5475d0543f076de
author Eric Fischer <enf@google.com> 1321938490 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938490 -0800

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

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