tree 756268658d3a4348a1467fdeb2596598ac837445
parent 763dd29b5025b3ee2bb7a964badf53d642908721
parent 2d64aeb05bd3bd9474717137ef611ea2101a1864
author Geoff Mendal <mendal@google.com> 1415062577 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415062577 +0000

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

* commit '2d64aeb05bd3bd9474717137ef611ea2101a1864':
  Import translations. DO NOT MERGE