tree 9f19b8ea52fa6449975da9b09a08362e050ac508
parent 349763d0e50a144b3b693b6bf0edca0d1e1dbea2
parent 2a44d878b7ac0cf4b3dba5a7800bed984f87d677
author Baligh Uddin <baligh@google.com> 1383693808 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383693808 -0800

am 2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '2a44d878b7ac0cf4b3dba5a7800bed984f87d677':
  Import translations. DO NOT MERGE