tree 57e49da0b90565c76a1394b8a875fc22e9ae0369
parent 73cbe0af0a5a2d46a02db9a68ab0b893cd3294f5
parent 85e9cc3b7072025bbb305015120348d3b325210c
author Eric Fischer <enf@google.com> 1365535922 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535922 -0700

am 85e9cc3b: (-s ours) Import translations. DO NOT MERGE

* commit '85e9cc3b7072025bbb305015120348d3b325210c':
  Import translations. DO NOT MERGE