tree bdd2d1316de05a792e8742a0ebfed59ec8604235
parent daf2f8332cf3b142a50d9e16f1c6f807afe02171
parent fd732acfcb765dd772136869d4493db9525bfed0
author Geoff Mendal <mendal@google.com> 1431585581 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431585581 +0000

am fd732acf: (-s ours) am e5465800: (-s ours) Import translations. DO NOT MERGE

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