tree 9b16e1b816f3cd06aac063c7f1cc38e9f177cffa
parent 18dc46e593caa21f061f00d6848b63ba59b26e2a
parent be1f17edeb31b38c51406aa8d4ddf204fec57780
author Geoff Mendal <mendal@google.com> 1413839592 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413839592 +0000

am be1f17ed: (-s ours) am 0dffb211: (-s ours) Import translations. DO NOT MERGE

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