tree 7faee150d91b286767324f43f6e370448f767789
parent a58acf3093d4bd46593ca16180a52285dde82c73
parent 8aa955dc6aceb1782c77f746b83eb557134062ed
author Baligh Uddin <baligh@google.com> 1412023619 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023619 +0000

am 8aa955dc: (-s ours) Import translations. DO NOT MERGE

* commit '8aa955dc6aceb1782c77f746b83eb557134062ed':
  Import translations. DO NOT MERGE