tree 6942b2620b879ed9a41490f5a7a06eba8988f41c
parent 73be6292cdbcc64476eb2eb8786dcea7c6c67ad3
parent 0666a43bd245afad8bb3255f7367a006fdf15ba8
author Geoff Mendal <mendal@google.com> 1422459208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422459208 +0000

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

* commit '0666a43bd245afad8bb3255f7367a006fdf15ba8':
  Import translations. DO NOT MERGE