tree 8e9330998c1bc1a4189e76c19427f5026e7f1365
parent 47ba346e1ea491f925ad47a4fa04b217bfcb4019
parent 40e66bce6ceea1b2b9d49a26564665222eb32745
author Geoff Mendal <mendal@google.com> 1423062289 +0000
committer android-build-merger <android-build-merger@google.com> 1423062289 +0000

Import translations. DO NOT MERGE
automerge: 40e66bc  -s ours

* commit '40e66bce6ceea1b2b9d49a26564665222eb32745':
  Import translations. DO NOT MERGE