tree c88f69b094cd49ae36aa7f5a187c9df099ddb20e
parent c3307f7b61ae37aa26a05b37604a04c9c2e47f19
parent 876a43e36112d192f1ecf4b768afc619d775389c
author Eric Fischer <enf@google.com> 1328897309 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897309 -0800

am 876a43e3: (-s ours) am fb314c77: Import translations. DO NOT MERGE

* commit '876a43e36112d192f1ecf4b768afc619d775389c':
  Import translations. DO NOT MERGE