tree b7cc72c12c7cc74b89898ea8ce68e199ff7d443b
parent 2a61476d5fad5d58da495e3e95c0974d99ecec45
parent 751b01e30ab091f79484edbfbb3589d4093ec6ee
author Geoff Mendal <mendal@google.com> 1436977528 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436977528 +0000

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

* commit '751b01e30ab091f79484edbfbb3589d4093ec6ee':
  Import translations. DO NOT MERGE