tree 79a8e1fa0dd214e57a722dc98a1bbb736a9d2a3f
parent 724ad179eeb64b836b4ef3da29f2c01b3cb80331
parent fdbfd3c995b132e60c8ee8644ad5759bd318928a
author Geoff Mendal <mendal@google.com> 1425306598 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425306598 +0000

am fdbfd3c9: (-s ours) am b77346ad: (-s ours) am 6b5b052e: (-s ours) Import translations. DO NOT MERGE

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