tree 5e1d38ae4fc271c021b4fde8bee8cda8b65e9297
parent 137e968a49077374b7bf07b1bb3f28eb65b9a95d
parent 57d484c5c24532f00e5358e1544c28b20fe564c0
author Geoff Mendal <mendal@google.com> 1424991683 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424991683 +0000

am 57d484c5: (-s ours) am 17f22104: (-s ours) Import translations. DO NOT MERGE

* commit '57d484c5c24532f00e5358e1544c28b20fe564c0':
  Import translations. DO NOT MERGE