tree 4aa127e08b8b00aba44e0eed72c527ec4d47fd8b
parent 971df150aa0f28d708ca0816862ecbd00b9bc55f
parent 1aa3abea279d8b3ead93d704d424757bfe65c2bd
author Geoff Mendal <mendal@google.com> 1413849642 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413849642 +0000

am 1aa3abea: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

* commit '1aa3abea279d8b3ead93d704d424757bfe65c2bd':
  Import translations. DO NOT MERGE