tree 33683c28b1035bb597e7d2e0adbaf727c96cfffd
parent 04250824ff4d5231ee17a060a7ce77fcc02a6657
parent 26310772872b327029cad560fa7b3e797b7980e9
author Geoff Mendal <mendal@google.com> 1421079268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421079268 +0000

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

* commit '26310772872b327029cad560fa7b3e797b7980e9':
  Import translations. DO NOT MERGE