tree f951c975eb2392551ddc0eecc2212fd7b65d1df0
parent 05ffc7265bfca0810d03177d61f7c1bb6bd39ecb
parent 494d2237b8d7b892902604c18098127e77372509
author Geoff Mendal <mendal@google.com> 1436982086 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436982086 +0000

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

* commit '494d2237b8d7b892902604c18098127e77372509':
  Import translations. DO NOT MERGE