tree 4c3fd0e15e99e0349af0936009315d3c3e56474c
parent b63f21bf0a32a1aba9b2c7977815f63273c7d858
parent f48b0f146843c5bceb746d2274c45750121779ae
author Geoff Mendal <mendal@google.com> 1454430446 +0000
committer android-build-merger <android-build-merger@google.com> 1454430446 +0000

Import translations. DO NOT MERGE am: 7d84a99d1d  -s ours am: 1bfd04808a  -s ours
am: f48b0f1468  -s ours

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