tree 6a66928ba0f67289546e1f12b28b49b6913e7ef4
parent fe62e1b1963aa9268e84d42efe9d9abdf7021725
parent c12a5011a5e369a85d5944ab0cf8ea6275f0b339
author Eric Fischer <enf@google.com> 1328897733 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897733 -0800

am c12a5011: (-s ours) am bb5aa487: am 077cf819: Import translations. DO NOT MERGE

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