tree a2c46d301627ef5094655143ef35e8fb2ead4c3b
parent 179b5638cf35ba95b2939c7da7cdf1315941b153
parent c3dbac7e5bc85b61ec6e407cca4bf9e8ff6e7d09
author Geoff Mendal <mendal@google.com> 1425054858 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425054858 +0000

am c3dbac7e: (-s ours) Import translations. DO NOT MERGE

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