tree 1af32cece7a35d50c9f41b3ce06ebcaa89318a4f
parent e79fc3cc4e43f45aa5de1dccf62cbe47340ac9a9
parent feedc755ee8388663d67d545ca08121ee8d3b12d
author Geoff Mendal <mendal@google.com> 1454938922 +0000
committer android-build-merger <android-build-merger@google.com> 1454938922 +0000

Import translations. DO NOT MERGE
am: feedc755ee  -s ours

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