tree 76ae93665cc705de7bc014bd40c24ae29bc9248f
parent 25eedd5958801cc3bee9ed06d8e6ef0ca6a3d513
parent 31427dda121e243e104d820c2923d3ebc0627b9b
author Geoff Mendal <mendal@google.com> 1458355522 +0000
committer android-build-merger <android-build-merger@google.com> 1458355522 +0000

Import translations. DO NOT MERGE
am: 31427dd  -s ours

* commit '31427dda121e243e104d820c2923d3ebc0627b9b':
  Import translations. DO NOT MERGE