tree c1b6b0cf01264338530dd4410205946d6785d060
parent 7614f33a7887ed5dc9c473634dc576daa901d94c
parent f0fa440fab8ff87726ddf1ff404bbbcc9bb59289
author Geoff Mendal <mendal@google.com> 1389652294 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389652294 -0800

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

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