tree f16e86b9795bd265c996028481e7a3556995480a
parent 49ae40aa2641254c624eb2819f678295d5da1651
parent b9a7ccf4117392606d03745158cb82f943b3243c
author Baligh Uddin <baligh@google.com> 1387481501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387481501 +0000

am b9a7ccf4: (-s ours) am 9d15d3c0: (-s ours) am d3b2e5b9: (-s ours) Import translations. DO NOT MERGE

* commit 'b9a7ccf4117392606d03745158cb82f943b3243c':
  Import translations. DO NOT MERGE