tree 2315f5c39925ed8cc7c5dc072671fa062981055c
parent d3712469862cbaef023b31d494ba7ae11773c5df
parent c7e670e28f4244324a55f056bcaf5901f3e32829
author Baligh Uddin <baligh@google.com> 1392411171 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411171 +0000

am c7e670e2: (-s ours) am de4817e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

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