tree bb27cb19b56f4fbef0649f34fec6888295723516
parent 67033b525555ebc51c325faa4b4ff9b3b4985fd7
parent 2c63c367443383fffbefbaafcb91a0131275f437
author Geoff Mendal <mendal@google.com> 1425055672 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425055672 +0000

am 2c63c367: (-s ours) am d58e82b4: (-s ours) Import translations. DO NOT MERGE

* commit '2c63c367443383fffbefbaafcb91a0131275f437':
  Import translations. DO NOT MERGE