tree 535c0a3a2388d4740a89138c26a177245aa30f88
parent 5eb5437aff10c0c6fe63dd6e57e8ac91e3b99c98
parent 82640f6f71bbc37337a90d359d8d2f027f025b71
author Geoff Mendal <mendal@google.com> 1439041012 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439041012 +0000

am 82640f6f: (-s ours) Import translations. DO NOT MERGE

* commit '82640f6f71bbc37337a90d359d8d2f027f025b71':
  Import translations. DO NOT MERGE