tree f6ea3e3f1732f93fe224c97e7689c7555d066933
parent d48f99a8baaabd10915400fb303dae2588b2ef9f
parent e68504f4a11296197c11b35aad71346b24af11be
author Geoff Mendal <mendal@google.com> 1391481085 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391481085 -0800

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

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