tree 059c60a3c002e2e2b6a22dc726d5e1e7bfe264ba
parent c281f6848218316c6e88bcf034c081575d52d903
parent 692ebf621ff5ffbb6d494b77fdbf69c95924b93d
author Eric Fischer <enf@google.com> 1316215624 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316215624 -0700

am 692ebf62: (-s ours) am 74191085: (-s ours) Import revised translations.  DO NOT MERGE

* commit '692ebf621ff5ffbb6d494b77fdbf69c95924b93d':
  Import revised translations.  DO NOT MERGE