tree f951c975eb2392551ddc0eecc2212fd7b65d1df0
parent ff19acd73db88cbb51df9bc41c860b3ab50e7416
parent cf51139c6e1d57b57177109f2177edc41edf5bbc
author Geoff Mendal <mendal@google.com> 1436983105 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436983105 +0000

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

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