tree c560330f63f0d44302791c6c42268f18c5732def
parent afe0e5de3052c7189ccbd620e85f81498444c4b9
parent be79130a6b56413b29d8b0308730a314b95dcc60
author Geoff Mendal <mendal@google.com> 1454430016 +0000
committer android-build-merger <android-build-merger@google.com> 1454430016 +0000

Import translations. DO NOT MERGE am: ca1d1d0bbe  -s ours
am: be79130a6b  -s ours

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