tree dce3c06ebcdf7d7de93ed30ba01300c0c5b627e4
parent 75beb3b32782488eaf575d1906e58b46749599c3
parent b3e5e4f54125df13863358463f598c224160a13a
author Geoff Mendal <mendal@google.com> 1422282520 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422282520 +0000

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

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