tree c7ff7828d5e23794bb83c8be0e82c1129ccf33df
parent 5be8659972e5b83ef3186d5367dc9582f68ce68a
parent da6e2ddb5bb9de84d004c726369f767c962adc18
author Geoff Mendal <mendal@google.com> 1423790482 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423790482 +0000

am da6e2ddb: (-s ours) am 875cdbd2: (-s ours) Import translations. DO NOT MERGE

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