tree 51a644168ccc6cf56ae057bc6dc88053c805bc2c
parent 83ca6b4664f5a5ec56be27751c83d27a7385b3de
parent 087cf483c009e92f548906cf7529345ceb86503a
author Eric Fischer <enf@google.com> 1316561161 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316561161 -0700

am 087cf483: (-s ours) am 53c67ee6: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

* commit '087cf483c009e92f548906cf7529345ceb86503a':
  Import revised translations.  DO NOT MERGE