tree ec21e6494b90751102b8e7d2e4f1b48e710372b4
parent 12bfcc3083647520216d9e07296dd5a333cd959c
parent 3afbc1ba6084c4b3d371b17ec471a819ada2379c
author Geoff Mendal <mendal@google.com> 1430540698 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430540698 +0000

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

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