tree 74f88cb0e90082cd357f603b6025281e6b616ff7
parent 1650476bd8ba41ef3bf630717cf954644bd5c1b0
parent 87712d44052e90068f6aa6e021d652b21918e60b
author Eric Fischer <enf@google.com> 1328897313 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897313 -0800

am 87712d44: am a167e65c: Import translations. DO NOT MERGE

* commit '87712d44052e90068f6aa6e021d652b21918e60b':
  Import translations. DO NOT MERGE