tree d8cecf107c0863e58cff6ab7df37e848fc895677
parent ded75eb8c9a0bd1ac0d34f27c6b2b579a68bae1f
parent ee6844fa2dfc890e4156a1042476701b004ffa7b
author Geoff Mendal <mendal@google.com> 1433172361 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433172361 +0000

am ee6844fa: (-s ours) am ba09684a: (-s ours) am aa303f67: (-s ours) Revert "Import translations. DO NOT MERGE"

* commit 'ee6844fa2dfc890e4156a1042476701b004ffa7b':
  Revert "Import translations. DO NOT MERGE"