tree 925685035ae440b6dac5e9cd56ba29c26067e7d6
parent 3563ea0b5f1842282d7d1f1c6482820bb0716d81
parent f4755878aaac7f53d2125ccc2d4c6bd15fe8d98f
author Geoff Mendal <mendal@google.com> 1450878556 -0800
committer android-build-merger <android-build-merger@google.com> 1450878556 -0800

Import translations. DO NOT MERGE am: 56f05b95ad  -s ours
am: f4755878aa  -s ours

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