tree 2c865b98b8cb52f3faa81f149b99f1467789d3d6
parent 3335973a6710135a299a615c7a48555c51586e97
parent feb731a2c94d2238587d1a84d0a2d09f99329612
author Geoff Mendal <mendal@google.com> 1426094725 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426094725 +0000

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

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