tree 6e4fb7c3ae5b54320e0a54d17c9c8863e9d262b1
parent dee25388edd6ae501034e8ad035df67b284b04db
parent 6be2d1fbf672acc65b33c4cb759499e52a948b31
author Baligh Uddin <baligh@google.com> 1381946525 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381946525 -0700

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

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