tree b08c14f930ef7340b2acb0ae9cdafe758d860857
parent affbd828459349396e000624a90a4ea800a7108b
parent c0dcd8d449e110130307577973f512cd9afb8e25
author Kenny Root <kroot@google.com> 1287244252 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287244252 -0700

am c0dcd8d4: (-s ours) am 7facaf19: Import revised translations

Merge commit 'c0dcd8d449e110130307577973f512cd9afb8e25'

* commit 'c0dcd8d449e110130307577973f512cd9afb8e25':
  Import revised translations