tree a136e8813eb45ae4ef1f7500949be767d839572f
parent 517547063e96768b8cc3869abf98d00968935a6a
parent 23a2d97cbcf8997b9a7c4d2d95434b96024eb64b
author Geoff Mendal <mendal@google.com> 1447856481 +0000
committer android-build-merger <android-build-merger@google.com> 1447856481 +0000

Import translations. DO NOT MERGE
am: 23a2d97cbc  -s ours

* commit '23a2d97cbcf8997b9a7c4d2d95434b96024eb64b':
  Import translations. DO NOT MERGE