tree 696d35b58eea07325f0a839d95eafdf79f9c0583
parent ddd4231bfd1b58901caa956bc118143ccbbba184
parent 9d3ecb7dfa8fc689709c836ce78ae76e5d27f80d
author Eric Fischer <enf@google.com> 1328897609 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897609 -0800

am 9d3ecb7d: am 5412bc99: (-s ours) am 3d9adfb0: am fb314c77: Import translations. DO NOT MERGE

* commit '9d3ecb7dfa8fc689709c836ce78ae76e5d27f80d':
  Import translations. DO NOT MERGE