tree 3c4361dceea18a7a538db9838a927f754b176a58
parent 96429d52c7ab61951678ce4c0cd2227736fc904b
parent 8dbbe115f6c0804f2316c8f0a5ad2ecf1c794bd7
author Eric Fischer <enf@google.com> 1316817869 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316817869 -0700

am 8dbbe115: (-s ours) am a4158566: (-s ours) Import revised translations.  DO NOT MERGE

* commit '8dbbe115f6c0804f2316c8f0a5ad2ecf1c794bd7':
  Import revised translations.  DO NOT MERGE