tree 2a54f750feb907fccb44631c3e47d4e7d60b974d
parent 8d452e2e9e88fae44c21d61da5d32842325033ef
parent c160e27c3c36bced882ab69bf42cba77f1d8f6a2
author Eric Fischer <enf@google.com> 1321537586 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537586 -0800

am c160e27c: (-s ours) am 2b38acc0: Import revised translations. DO NOT MERGE

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