tree c43e69b91ab10a1af814fd4726882d09747baa38
parent 4e6cca03cfb1176de5fecce3bdad93c0c3d0ee33
parent 0141792813d503c13450ebf4fe3b805a72866213
author Geoff Mendal <mendal@google.com> 1421782777 +0000
committer android-build-merger <android-build-merger@google.com> 1421782777 +0000

Import translations. DO NOT MERGE
automerge: 0141792  -s ours

* commit '0141792813d503c13450ebf4fe3b805a72866213':
  Import translations. DO NOT MERGE