tree 4326defe6a8718dba65ffca6226e302516a9624b
parent 87478ab5f6f86de9cf1c3f6eb3a705eff57c35d8
parent 72879d40ce7a13f4e3ed18edd83f3bd7c2841b1b
author Geoff Mendal <mendal@google.com> 1436984004 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436984004 +0000

am 72879d40: (-s ours) am cf51139c: (-s ours) am 494d2237: (-s ours) am a83129f0: (-s ours) am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE

* commit '72879d40ce7a13f4e3ed18edd83f3bd7c2841b1b':
  Import translations. DO NOT MERGE