tree f16e86b9795bd265c996028481e7a3556995480a
parent 1880e94ba39fd9c31e6f82a5aa5b5f7421ab7a0f
parent 5498bd2b257664d4cecc4706e6de149e013454b0
author Baligh Uddin <baligh@google.com> 1389117630 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389117630 +0000

am 5498bd2b: (-s ours) am 0f0ffc64: (-s ours) am 484fad59: (-s ours) Import translations. DO NOT MERGE

* commit '5498bd2b257664d4cecc4706e6de149e013454b0':
  Import translations. DO NOT MERGE