tree efd2a9ab0b2c08a1181dcc8395464e10c65e1e47
parent 65cf68daed8ea6ee1c6d7b11e508847a69b15f6b
parent c1b34cec7bd0016ca433bf6087991bca18c3e500
author Eric Fischer <enf@google.com> 1339100864 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339100864 -0700

am c1b34cec: Import translations. DO NOT MERGE

* commit 'c1b34cec7bd0016ca433bf6087991bca18c3e500':
  Import translations. DO NOT MERGE