tree 2c5f1a8247f88a417af71b29701085c0b7441c0d
parent c22691223c65a112de898d5e6406a5e30cb5639a
parent 3c46e93981e5e056df30cd7ab286b3cc0c5644b4
author Geoff Mendal <mendal@google.com> 1436800200 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436800200 +0000

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

* commit '3c46e93981e5e056df30cd7ab286b3cc0c5644b4':
  Import translations. DO NOT MERGE