tree a3ae520a31e0160f90fd865f77d7b01905e50164
parent 22663e0f0366e980dd06714fe0aea6e2c9f03911
parent 6ecd8e883f6b25f5f1b7799fa6c75551e5788d61
author Baligh Uddin <baligh@google.com> 1398350456 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398350456 +0000

am 6ecd8e88: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova

* commit '6ecd8e883f6b25f5f1b7799fa6c75551e5788d61':
  Import translations. DO NOT MERGE